From a20fd6526dc6c23c10df1e0cad6955f99f1fd77b Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sun, 6 Jun 2021 19:13:44 +0000
Subject: [PATCH 1/4] Auto-update README

---
 README.md    | 22 +++++-----------------
 README_fr.md | 34 +++++++++++++---------------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 61c566a..1344c2a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-
-
----
-
 <!--
 N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
 It shall NOT be edited by hand.
@@ -9,12 +5,12 @@ It shall NOT be edited by hand.
 
 # Miniflux for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg)
-[![Install miniflux with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux)
+[![Integration level](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg)  
+[![Install Miniflux with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install miniflux quickly and simply on a YunoHost server.
+> *This package allows you to install Miniflux quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
@@ -25,28 +21,20 @@ Minimalist and opinionated RSS feed reader
 
 
 
-
 ## Screenshots
 
-
-   ![](./doc/screenshots/overview.png)
-
-
-
+![](./doc/screenshots/overview.png)
 
 ## Disclaimers / important information
 
 ## Configuration
 
 You can also configure Miniflux by editing this file `/var/www/miniflux/miniflux.conf` using the [documentation](https://miniflux.app/docs/configuration.html).
-
-
 ## Documentation and resources
 
 * Official app website: https://miniflux.app/
-
 * Official admin documentation: https://miniflux.app/docs/index.html
-* Upstream app code repository:  https://github.com/miniflux/v2
+* Upstream app code repository: https://github.com/miniflux/v2
 * YunoHost documentation for this app: https://yunohost.org/app_miniflux
 * Report a bug: https://github.com/YunoHost-Apps/miniflux_ynh/issues
 
diff --git a/README_fr.md b/README_fr.md
index d96e902..25145c3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,46 +1,38 @@
 # Miniflux pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg)
-[![Installer miniflux avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux)
+[![Niveau d'intégration](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg)  
+[![Installer Miniflux avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install miniflux quickly and simply on a YunoHost server.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+> *Ce package vous permet d'installer Miniflux rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
 
 Agrégateur de flux RSS minimaliste
 
-**Version incluse:** 2.0.30~ynh1
-
+**Version incluse :** 2.0.30~ynh1
 
 
 
 ## Captures d'écran
 
-
-   ![](./doc/screenshots/overview.png)
-
-
-
+![](./doc/screenshots/overview.png)
 
 ## Avertissements / informations importantes
 
 ## Configuration
 
 Vous pouvez configurer Miniflux en modifiant le fichier `/var/www/miniflux/miniflux.conf` en vous aidant de la [documentation](https://miniflux.app/docs/configuration.html).
-
-
 ## Documentations et ressources
 
-* Site official de l'app : https://miniflux.app/
-
-* Documentation officielle de l'admin: https://miniflux.app/docs/index.html
-* Dépôt de code officiel de l'app:  https://github.com/miniflux/v2
-* Documentation YunoHost pour cette app: https://yunohost.org/app_miniflux
-* Signaler un bug: https://github.com/YunoHost-Apps/miniflux_ynh/issues
+* Site officiel de l'app : https://miniflux.app/
+* Documentation officielle de l'admin : https://miniflux.app/docs/index.html
+* Dépôt de code officiel de l'app : https://github.com/miniflux/v2
+* Documentation YunoHost pour cette app : https://yunohost.org/app_miniflux
+* Signaler un bug : https://github.com/YunoHost-Apps/miniflux_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -49,8 +41,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno
 Pour essayer la branche testing, procédez comme suit.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing --debug
-or
+ou
 sudo yunohost app upgrade miniflux -u https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file

From 0dcba527663ccf41eba04545a6326c4a63aac4a0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 6 Jun 2021 21:13:51 +0200
Subject: [PATCH 2/4] 2.0.31

---
 conf/amd64.src | 4 ++--
 conf/arm5.src  | 4 ++--
 conf/arm6.src  | 4 ++--
 conf/arm64.src | 4 ++--
 conf/arm7.src  | 4 ++--
 manifest.json  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/conf/amd64.src b/conf/amd64.src
index 0f5a99e..5918d90 100644
--- a/conf/amd64.src
+++ b/conf/amd64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.30/miniflux-linux-amd64
-SOURCE_SUM=9f099c93b6b1a6f0b97e5954c95116a4cd760aed25250596e863b6cfad633b03
+SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.31/miniflux-linux-amd64
+SOURCE_SUM=42c82bdd48a98fd1f2e9a917b490562df657f44247250cb0b0b3fed298a5b515
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=miniflux
diff --git a/conf/arm5.src b/conf/arm5.src
index c97be13..953b6e6 100644
--- a/conf/arm5.src
+++ b/conf/arm5.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.30/miniflux-linux-armv5
-SOURCE_SUM=ece08f6bf86a4b86de13dba5e1641f12d3b6e4e60d42c343a8953eb22b853c6b
+SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.31/miniflux-linux-armv5
+SOURCE_SUM=1da9c5a319cbee89ab1a680e49054b586445db722826cddee2c87cd1b9223cab
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=miniflux
diff --git a/conf/arm6.src b/conf/arm6.src
index 8db4709..2349f7d 100644
--- a/conf/arm6.src
+++ b/conf/arm6.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.30/miniflux-linux-armv6
-SOURCE_SUM=ffb71c66ad8f3a201c68482a67a9116cbfc5d02b859989063c30881ed56ef1c7
+SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.31/miniflux-linux-armv6
+SOURCE_SUM=6a6218927582266b409bbf076de279fdc94748a816ff545f8902105e24e832cf
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=miniflux
diff --git a/conf/arm64.src b/conf/arm64.src
index 4690d06..107478f 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.30/miniflux-linux-arm64
-SOURCE_SUM=33850fa88696eeb7fe0dd14242608c0b71764e0c91130af913bc0adbf9551315
+SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.31/miniflux-linux-arm64
+SOURCE_SUM=7b03fb08f378f8972f5d9c456ec421852560fae27b5975952dc86cecf1ad7b80
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=miniflux
diff --git a/conf/arm7.src b/conf/arm7.src
index 859c88b..d4598bf 100644
--- a/conf/arm7.src
+++ b/conf/arm7.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.30/miniflux-linux-armv7
-SOURCE_SUM=f30ed0538c36d11fd167d8c430f1c32546c93a8223bc0a85c061e5658d205cda
+SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.31/miniflux-linux-armv7
+SOURCE_SUM=5d9d57eea1fa0a0b0fec945753b85718568e6d976b383d8788510af2206221f4
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=miniflux
diff --git a/manifest.json b/manifest.json
index 69d0df5..5d0a8c7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Minimalist and opinionated RSS feed reader",
         "fr": "Agrégateur de flux RSS minimaliste"
     },
-    "version": "2.0.30~ynh1",
+    "version": "2.0.31~ynh1",
     "url": "https://miniflux.app/",
     "upstream": {
         "license": "Apache-2.0",

From 88605f2fdc75b6c36abb851a883a9e75490aaa0e Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sun, 6 Jun 2021 19:14:07 +0000
Subject: [PATCH 3/4] Auto-update README

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

diff --git a/README.md b/README.md
index 1344c2a..c819821 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Minimalist and opinionated RSS feed reader
 
-**Shipped version:** 2.0.30~ynh1
+**Shipped version:** 2.0.31~ynh1
 
 
 
diff --git a/README_fr.md b/README_fr.md
index 25145c3..d536f35 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Agrégateur de flux RSS minimaliste
 
-**Version incluse :** 2.0.30~ynh1
+**Version incluse :** 2.0.31~ynh1
 
 
 

From 9f568001866ccca05f16176c3b711d928730b252 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 6 Jun 2021 21:15:09 +0200
Subject: [PATCH 4/4] Update check_process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index 286ba0e..6847c6a 100644
--- a/check_process
+++ b/check_process
@@ -13,7 +13,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#upgrade=1   from_commit=
+		upgrade=1   from_commit=d0cc76d6bee9408859d3176a2fe3e33d61107998
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -21,6 +21,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=
-		name=
+	; commit=d0cc76d6bee9408859d3176a2fe3e33d61107998
+		name=Merge pull request #2
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=4533&
\ No newline at end of file