Merge branch 'master' into quickstart_v2

2016-12-06 14:10:22 +01:00
parent d4c06a4eba 2fca4edf8e
commit 344891c432
22 changed files with 56 additions and 46 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     - "5432"
    env_file: .env
  import-natural-earth:
-    image: "openmaptiles/import-natural-earth:1.0"
+    image: "openmaptiles/import-natural-earth:1.1"
    env_file: .env
    links:
    - postgres