diff options
Diffstat (limited to 'changelog.md')
| -rw-r--r-- | changelog.md | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/changelog.md b/changelog.md index 7fd1e89c..6682743c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,29 @@ +<<<<<<< HEAD [v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/5ba3e68) (2021-09-22) dont update config if Redis is not yet ready +======= +<<<<<<< HEAD +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (2021-09-22) dont update config if Redis is not yet ready +>>>>>>> 37f01dc (letsencrypt: fix active status check) [v1.39.6 ](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine +======= +<<<<<<< HEAD +<<<<<<< HEAD +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (2021-09-22) dont update config if Redis is not yet ready + +[v1.39.6 ](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine +======= +======= +>>>>>>> 3c905ea (letsencrypt: fix active status check) +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/a6fd394) (2021-09-22) dont update config if Redis is not yet ready +======= +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check +>>>>>>> a07ddd2 (letsencrypt: fix active status check) + +[v1.39.6](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine +>>>>>>> f289443 (dont update config if Redis is not yet ready) +>>>>>>> 6b852d2 (letsencrypt: fix active status check) [v1.39.5 ](https://github.com/nextcloud/nextcloudpi/commit/cb184d2) (2021-09-19) ncp-update-nc: dont keep notifying when there is nothing to upgrade |