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/mariadb-conf/docker.cnf
+++ b/nextcloud/mariadb-conf/docker.cnf
@ -3,4 +3,8 @@ innodb_buffer_pool_size=2G
 innodb_io_capacity=4000
 innodb_io_capacity_max=4000
 skip-host-cache
-skip-name-resolve
+<<<<<<< HEAD
+skip-name-resolve
+=======
+skip-name-resolve
+>>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3