From 1eda887adea3599e18fb5e32b08d681820b91614 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 27 Feb 2020 20:05:27 +0100
Subject: [PATCH] Upgrade to 3.1.2

---
 README.md     |  2 +-
 README_fr.md  |  2 +-
 check_process | 16 ++++++++++++++++
 conf/app.src  |  4 ++--
 manifest.json |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index dfce394..30abd8e 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.
 
-**Shipped version:** 3.1.1
+**Shipped version:** 3.1.2
 
 ## Important points to read before installing
 
diff --git a/README_fr.md b/README_fr.md
index 2092750..78e6170 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Vue d'ensemble
 Mastodon est un réseau social gratuit et open source. Une alternative décentralisée aux plates-formes commerciales, elle évite les risques d'une seule société qui monopolise votre communication. Choisissez un serveur sur lequel vous faites confiance - selon votre choix, vous pouvez interagir avec tous les autres. N'importe qui peut exécuter sa propre instance de Mastodon et participer au réseau social de façon transparente.
 
-**Version incluse:** 3.1.1
+**Version incluse:** 3.1.2
 
 ## Points importants à lire avant l'installation
 
diff --git a/check_process b/check_process
index 21c17ae..951b1d3 100644
--- a/check_process
+++ b/check_process
@@ -12,8 +12,24 @@
 		setup_private=0
 		setup_public=1
 		upgrade=1
+		# 2.7.4
+		upgrade=1	from_commit=2987ccf8b3aa393dbef79b874dfe5839a0ee10da
+		# 2.8.2
+		upgrade=1	from_commit=2697b734a663bd828d609d3626552611995e6c07
+		# 2.8.3
+		upgrade=1	from_commit=19299ae680dc851f03a37d49f4e80ca8521e615f
+		# 2.8.4
+		upgrade=1	from_commit=a25e4569c8341ec94a39a57aaccad86379c8a630
+		# 2.9.0
+		upgrade=1	from_commit=8d0d3ea6611d788635251379e4a51d566b19d8db
+		# 2.9.2
+		upgrade=1	from_commit=1ec1d44c6ed1daa5887367700f077286355a184f
+		# 2.9.3
+		upgrade=1	from_commit=b9086682d2d7762d2882fff2cda4f5dceb73e32b
 		# 3.0.1
 		upgrade=1	from_commit=168573d3d7dcc4306691f21d5b64819d1f6dd38c
+		# 3.1.1
+		upgrade=1	from_commit=53aeae382eda1263d0ebf9a454bd1c3eeca8ddb1
 		backup_restore=1
 		multi_instance=1
 		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
diff --git a/conf/app.src b/conf/app.src
index 5e78c4e..fc275ee 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.1.tar.gz
-SOURCE_SUM=4d44458b28667e49bc0d69e7f344a953f869a0df5e41140d932982aa952ab13c 
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz
+SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 1a29d40..a38eac9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "3.1.1~ynh1",
+	"version": "3.1.2~ynh1",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": [