Merge branches 'master' and 'remote_setup' of https://gitea.sporada.eu/sporada/selfhosted-traefik

2021-04-29 11:11:57 +02:00
parent ca3a126691 5de4093a29
commit 8ffa30b17d
8 changed files with 269 additions and 1 deletions
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -36,7 +36,12 @@ services:
    volumes:
      - ${NEXTCLOUD_ROOT}/redis:/data
      - /etc/localtime:/etc/localtime:ro
+<<<<<<< HEAD
      - /etc/timezone:/etc/timezone:ro      
+=======
+      - /etc/timezone:/etc/timezone:ro
+      
+>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3

  nextcloud-app:
    depends_on: