Resolve conflicts

2020-05-21 15:53:25 +07:00
parent c56f042217 9a27cc366f
commit 857be2c006
12 changed files with 162 additions and 33 deletions
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,4 +12,4 @@ services:
        max-size: 50m
    volumes:
      - ./db:/app/db
-      - /etc/wireguard:/etc/wireguard
+#      - /etc/wireguard:/etc/wireguard