feat: file resolvers + pull changes from master

2017-09-04 13:03:15 -04:00
parent 574e4b97f4
commit 35cb56c694
10 changed files with 459 additions and 313 deletions
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -14,6 +14,6 @@ services:
    ports:
      - '80:3000'
    environment:
-      - WIKI_ADMIN_EMAIL: admin@example.com
+      WIKI_ADMIN_EMAIL: admin@example.com
    volumes:
      - ./config.yml:/var/wiki/config.yml