1
Fork 0

Merge branch 'master'

Conflicts:
	etc/environments/deployment/env
	etc/environments/development/env
	requirements.txt
	templates/index.html
This commit is contained in:
Jake Howard 2016-05-13 19:33:26 +01:00
commit 887edadff0

1
.gitignore vendored
View file

@ -59,3 +59,4 @@ docs/_build/
target/ target/
private/ private/
database.db