From e44279195ae5088f174280945cda0921b48b3c48 Mon Sep 17 00:00:00 2001
From: Tagadda <36127788+Tagadda@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:01:22 +0100
Subject: [PATCH] Auto-update README

---
 README.md    | 4 ++++
 README_fr.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 4dff445..88aae9d 100644
--- a/README.md
+++ b/README.md
@@ -98,9 +98,13 @@ Log-out from YunoHost's portal doesn't log out from Mastodon. See https://github
 * Official admin documentation: <https://docs.joinmastodon.org/>
 * Upstream app code repository: <https://github.com/mastodon/mastodon>
 <<<<<<< HEAD
+<<<<<<< HEAD
 * YunoHost Store: <https://apps.yunohost.org/app/mastodon>
 =======
 >>>>>>> 2a48dd2 (Auto-update README)
+=======
+* YunoHost Store: <https://apps.yunohost.org/app/mastodon>
+>>>>>>> 5d3e90f (Auto-update README)
 * Report a bug: <https://github.com/YunoHost-Apps/mastodon_ynh/issues>
 
 ## Developer info
diff --git a/README_fr.md b/README_fr.md
index f736767..646d4f3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -104,9 +104,13 @@ Se déconnecter depuis le portail YunoHost ne vous déconnecte pas de Mastodon.
 * Documentation officielle de l’admin : <https://docs.joinmastodon.org/>
 * Dépôt de code officiel de l’app : <https://github.com/mastodon/mastodon>
 <<<<<<< HEAD
+<<<<<<< HEAD
 * YunoHost Store: <https://apps.yunohost.org/app/mastodon>
 =======
 >>>>>>> 2a48dd2 (Auto-update README)
+=======
+* YunoHost Store: <https://apps.yunohost.org/app/mastodon>
+>>>>>>> 5d3e90f (Auto-update README)
 * Signaler un bug : <https://github.com/YunoHost-Apps/mastodon_ynh/issues>
 
 ## Informations pour les développeurs