upgrade to NC23.0.2v1.46.0

Signed-off-by: nachoparker <nacho@ownyourbits.com>

6 files changed, 14 insertions, 12 deletions

diff --git a/README.md b/README.md
index b3a3108c..bde58d21 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co
 
 ## Features
 
- * Debian/Raspbian 10 Buster
- * Nextcloud 22.2.2
+ * Debian/Raspbian 11 Bullseye
+ * Nextcloud 23.0.2
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.4
  * MariaDB 10
diff --git a/changelog.md b/changelog.md
index 87641a3e..0de5123a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,13 +1,15 @@
 
-<<<<<<< HEAD
-[v1.46.7](https://github.com/nextcloud/nextcloudpi/commit/0da8dcd) (2021-12-13) letsencrypt: fix invalid arithmetic operator error
-=======
-[v1.45.0](https://github.com/nextcloud/nextcloudpi/commit/b0379f1) (2021-11-09) update to Debian 11 Bullseye
->>>>>>> 41f692c (update to Debian 11 Bullseye)
+[v1.46.0](https://github.com/nextcloud/nextcloudpi/commit/cbf26e4) (2022-03-01) upgrade to NC23.0.2
+
+[v1.45.0 ](https://github.com/nextcloud/nextcloudpi/commit/5c8e5ea) (2021-11-09) update to Debian 11 Bullseye
+
+[v1.44.8](https://github.com/nextcloud/nextcloudpi/commit/dd8fc3d) (2022-01-10) fix update from pre-1.46 to post-1.46 not working in docker (#1406)
+
+[v1.44.7 ](https://github.com/nextcloud/nextcloudpi/commit/bcd850c) (2021-12-13) letsencrypt: fix invalid arithmetic operator error
 
 [v1.44.6 ](https://github.com/nextcloud/nextcloudpi/commit/26a7778) (2021-12-06) notify_push: fix service not restarting on binary update (#1398)
 
-[v1.44.5](https://github.com/nextcloud/nextcloudpi/commit/5a404c0) (2021-11-29) ncp-previewgenerator: fix app enable in NC22
+[v1.44.5 ](https://github.com/nextcloud/nextcloudpi/commit/5a404c0) (2021-11-29) ncp-previewgenerator: fix app enable in NC22
 
 [v1.44.4 ](https://github.com/nextcloud/nextcloudpi/commit/0a4f8c1) (2021-11-19) ncp-web: fix spurious characters in power menu
 
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index d43b5539..8735d698 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "22.2.2"
+      "value": "23.0.2"
     },
     {
       "id": "MAXFILESIZE",
diff --git a/etc/ncp.cfg b/etc/ncp.cfg
index 2f355891..37bde2f6 100644
--- a/etc/ncp.cfg
+++ b/etc/ncp.cfg
@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "22.2.2",
+	"nextcloud_version": "23.0.2",
 	"php_version": "7.4",
 	"release": "bullseye"
 }
diff --git a/ncp-app/appinfo/info.xml b/ncp-app/appinfo/info.xml
index 97379f25..ec86c6f7 100644
--- a/ncp-app/appinfo/info.xml
+++ b/ncp-app/appinfo/info.xml
@@ -12,7 +12,7 @@
     <category>tools</category>
     <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs>
     <dependencies>
-        <nextcloud min-version="14" max-version="22"/>
+        <nextcloud min-version="14" max-version="23"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
index c34e4b60..f8b29438 100644
--- a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
+++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
@@ -25,7 +25,7 @@ The first time you install this app, before using a cron job, you properly want
 	</types>
 	<dependencies>
 		<php min-version="7.2"/>
-		<nextcloud min-version="20" max-version="22" />
+		<nextcloud min-version="20" max-version="23" />
 	</dependencies>
 
 	<commands>