From e46d01c372decb64274e3cd5bd036568cea368ea Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Mon, 21 Feb 2022 11:50:02 -0600
Subject: [PATCH 1/2] Upgrade to 2022.02.

---
 manifest.json      | 2 +-
 scripts/_common.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index caac2b8..79c1211 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
     "en": "Social Communication Server",
     "fr": "Serveur de Communication Social"
   },
-  "version": "2021.09~ynh1",
+  "version": "2022.02~ynh1",
   "url": "http://friendi.ca",
   "upstream": {
         "license": "AGPL-3.0-only",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9a647ae..d831678 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,8 +6,8 @@
 
 # commit hashes
 # 2021.09
-version_commit="1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1"
-addons_version_commit="b164910032a620bd637574bd4b42423ff8c067bb"
+version_commit="72c4ed95f16e82239924099254a3d8fc9638cd07"
+addons_version_commit="dd6bf79e194ed5bdf0a40ee3c5ad76cceb24d31d"
 
 # dependencies used by the app
 YNH_PHP_VERSION="7.3"

From cbc9e030195840b98be9ad89ea3626d22885f528 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 8 Mar 2022 10:11:26 +0100
Subject: [PATCH 2/2] Change branch to develop

the stable branch does not exist
---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index d73b8f9..13c5e0a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -90,7 +90,7 @@ popd
 cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess"
 
 # 2 - Clone addons repo 
-git clone --quiet https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" 
+git clone --quiet https://github.com/friendica/friendica-addons.git -b develop "$final_path/addon" 
 # Reset addons branch to the level of update we needed
 pushd "$final_path/addon"
 	git reset --hard --quiet $addons_version_commit