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

Auto-update README

Browse source
This commit is contained in:
Tagadda 2024-02-22 20:01:26 +01:00
parent dfa6e7c509
commit c0e2b71619
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -23,6 +23,7 @@ Mastodon is a free, open-source microblogging social network. It is a decentrali
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
**Shipped version:** 4.2.7~ynh1 **Shipped version:** 4.2.7~ynh1
======= =======
**Shipped version:** 4.1.4~ynh2 **Shipped version:** 4.1.4~ynh2
@ -39,6 +40,9 @@ Mastodon is a free, open-source microblogging social network. It is a decentrali
======= =======
**Shipped version:** 4.2.1~ynh1 **Shipped version:** 4.2.1~ynh1
>>>>>>> bce29b7 (Auto-update README) >>>>>>> bce29b7 (Auto-update README)
=======
**Shipped version:** 4.2.3~ynh1
>>>>>>> 2c74089 (Auto-update README)
**Demo:** https://joinmastodon.org/ **Demo:** https://joinmastodon.org/

4
README_fr.md
View file

@ -24,6 +24,7 @@ Mastodon est un réseau social de microblog auto-hébergé et open source. C'est
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
**Version incluse :** 4.2.7~ynh1 **Version incluse :** 4.2.7~ynh1
======= =======
**Version incluse :** 4.1.4~ynh2 **Version incluse :** 4.1.4~ynh2
@ -40,6 +41,9 @@ Mastodon est un réseau social de microblog auto-hébergé et open source. C'est
======= =======
**Version incluse :** 4.2.1~ynh1 **Version incluse :** 4.2.1~ynh1
>>>>>>> bce29b7 (Auto-update README) >>>>>>> bce29b7 (Auto-update README)
=======
**Version incluse :** 4.2.3~ynh1
>>>>>>> 2c74089 (Auto-update README)
**Démo :** https://joinmastodon.org/ **Démo :** https://joinmastodon.org/