From accef994bdf9f0a7861cd52278b10e1ea487e804 Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Mon, 22 May 2023 13:04:09 +0200
Subject: [PATCH] Merge testing into v2

Upgrade to v2023.05.17
---
 README.md     |  2 +-
 README_fr.md  |  2 +-
 manifest.toml | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a0511c4..b2fb8f7 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Shipped version:** 2023.05.09~ynh1
+**Shipped version:** 2023.05.17~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 7ed42f0..b584371 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -45,7 +45,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais).
 
 
-**Version incluse :** 2023.05.09~ynh1
+**Version incluse :** 2023.05.17~ynh1
 
 ## Captures d’écran
 
diff --git a/manifest.toml b/manifest.toml
index 66c7132..77283d2 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Glitch-Soc"
 description.en = "Libre and federated social network, fork of Mastodon"
 description.fr = "Réseau social libre et fédéré, scission de Mastodon"
 
-version = "2023.05.09~ynh1"
+version = "2023.05.17~ynh1"
 
 maintainers = ["Tagada"]
 
@@ -22,9 +22,9 @@ architectures = "all"
 multi_instance = true
 ldap = true
 sso = true
-disk = "1G"
-ram.build = "2500M"
-ram.runtime = "700M"
+disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
+ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
 
 [install]
     [install.domain]
@@ -57,8 +57,8 @@ ram.runtime = "700M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/glitch-soc/mastodon/archive/f08f6d20e607f8af02dcd23afa019ebee7ad36a9.tar.gz"
-        sha256 = "7659cd68254f9c1a99411232665f1846c38c452b82f869437bbbb39d6b111425"
+        url = "https://github.com/glitch-soc/mastodon/archive/058898802a377877961ff3bfa7d5209a5e275545.tar.gz"
+        sha256 = "23bda1113c8977f0b94bcbce32bb69aa83ba9c05511a2b7570aeae3211b76cf2"
 
         autoupdate.strategy = "latest_github_commit"