1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00

Merge branch 'master' into 3.1.3

This commit is contained in:
yalh76 2020-06-04 00:12:42 +02:00
commit b95e22a689
2 changed files with 3 additions and 3 deletions

View file

@ -12,7 +12,7 @@
setup_private=0 setup_private=0
setup_public=1 setup_public=1
upgrade=1 upgrade=1
# 3.1.2 # 3.1.2~ynh2
upgrade=1 from_commit=7e1f4c2dee5f2c8374686aea62f4648cdf2722c3 upgrade=1 from_commit=7e1f4c2dee5f2c8374686aea62f4648cdf2722c3
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1

View file

@ -3,8 +3,8 @@
"id": "mastodon", "id": "mastodon",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Mastodon is a free, open-source social network.", "en": "A libre and federated social network.",
"fr": "Mastodon est un réseau social gratuit et open source." "fr": "Un réseau social libre et fédéré."
}, },
"version": "3.1.3~ynh1", "version": "3.1.3~ynh1",
"url": "https://github.com/tootsuite/mastodon", "url": "https://github.com/tootsuite/mastodon",