diff options
Diffstat (limited to 'changelog.md')
| -rw-r--r-- | changelog.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/changelog.md b/changelog.md index 1168180c..67b03b95 100644 --- a/changelog.md +++ b/changelog.md @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< 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 @@ -19,14 +20,23 @@ >>>>>>> 3c905ea (letsencrypt: fix active status check) ======= >>>>>>> bac07b7 (letsencrypt: fix renewal with httpsonly enabled) +======= +>>>>>>> 2060cc8 (fix inverted template logic for docker) [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) ======= +======= +>>>>>>> 9ece76e (fix inverted template logic for docker) [v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check ======= [v1.39.9](https://github.com/nextcloud/nextcloudpi/commit/836d66d) (2021-09-21) letsencrypt: fix renewal with httpsonly enabled +======= +[v1.39.10](https://github.com/nextcloud/nextcloudpi/commit/27e7d06) (2021-09-21) fix inverted template logic for docker + +[v1.39.9 ](https://github.com/nextcloud/nextcloudpi/commit/afeb957) (2021-09-21) letsencrypt: fix renewal with httpsonly enabled +>>>>>>> 215574b (fix inverted template logic for docker) [v1.39.8](https://github.com/nextcloud/nextcloudpi/commit/6fca91c) (2021-09-21) letsencrypt: take into account duplicate domains ending in -0001 |