From 2cccdcedcc1c9d89ff8f66a9f37f4d60a9a209a0 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 6 Apr 2019 23:06:54 +0200
Subject: [PATCH] Re-merge community and official

---
 apps.json | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 8e7942ee..f9744ccf 100644
--- a/apps.json
+++ b/apps.json
@@ -22,6 +22,12 @@
         "state": "inprogress",
         "url": "https://github.com/YunoHost-Apps/abantecart_ynh"
     },
+    "adguard": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "working",
+        "url": "https://github.com/YunoHost-Apps/adguard_ynh"
+    },
     "adhocserver": {
         "branch": "master",
         "level": 2,
@@ -76,6 +82,12 @@
         "state": "working",
         "url": "https://github.com/opi/anarchism_ynh"
     },
+    "anfora": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "inprogress",
+        "url": "https://github.com/YunoHost-Apps/anfora_ynh"
+    },
     "apticron": {
         "branch": "master",
         "maintained": false,
@@ -1043,6 +1055,12 @@
         "state": "inprogress",
         "url": "https://github.com/mat-mo/miniflux_ynh"
     },
+    "mobilizon": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "inprogress",
+        "url": "https://github.com/YunoHost-Apps/mobilizon_ynh"
+    },
     "modernpaste": {
         "branch": "master",
         "level": 0,
@@ -1465,6 +1483,18 @@
         "state": "inprogress",
         "url": "https://github.com/YunoHost-Apps/redirect_ynh"
     },
+    "redmine": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "working",
+        "url": "https://github.com/YunoHost-Apps/redmine_ynh"
+    },
+    "reel2bits": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "inprogress",
+        "url": "https://github.com/YunoHost-Apps/reel2bits_ynh"
+    },
     "remotestorage": {
         "branch": "master",
         "revision": "HEAD",
@@ -1572,6 +1602,12 @@
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/shellinabox_ynh"
     },
+    "shinken": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "working",
+        "url": "https://github.com/YunoHost-apps/shinken_ynh"
+    },
     "shsd": {
         "branch": "master",
         "level": 3,
@@ -2015,6 +2051,12 @@
         "state": "working",
         "url": "https://github.com/YunoHost-Apps/zabbix_ynh"
     },
+    "zap": {
+        "branch": "master",
+        "revision": "HEAD",
+        "state": "working",
+        "url": "https://github.com/YunoHost-Apps/zap_ynh"
+    },
     "zerobin": {
         "branch": "master",
         "high_quality": true,
@@ -2039,4 +2081,4 @@
         "state": "inprogress",
         "url": "https://github.com/courgette/zomburl_ynh"
     }
-}
+}
\ No newline at end of file