Merge branch 'master' into quicker_count

This commit is contained in:
Curtis
2018-05-24 12:57:40 -07:00
committed by GitHub

View File

@ -10,6 +10,7 @@ services:
command: make test command: make test
environment: environment:
SQLALCHEMY_DATABASE_URI: postgresql://lemur:lemur@postgres:5432/lemur SQLALCHEMY_DATABASE_URI: postgresql://lemur:lemur@postgres:5432/lemur
VIRTUAL_ENV: 'true'
postgres: postgres:
image: postgres:9.4 image: postgres:9.4