Merge branch 'master' into develop

2017-09-18 12:32:29 +02:00
parent a9e3130ef6 a687a6605d
commit 41e01184aa
488 changed files with 30610 additions and 169220 deletions
@@ -1,5 +1,5 @@
 postgrestest:
-  image: postgres:latest
+  image: postgres:9.4.14
  environment:
    POSTGRES_USER: grafana
    POSTGRES_PASSWORD: password