Jonas Franz a8dc699e74 Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/error.go
#	models/migrations/migrations.go
#	models/models.go
#	public/js/index.js

2018-05-19 18:17:01 +02:00

..

doc

Merge branch 'master' into feat/approval-new

2018-05-19 18:17:01 +02:00

page

Fix docs site index page (#3868)

2018-04-30 20:54:38 +03:00