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
..
gitignore	Synced gitignores with github repo (#1245)	2017-03-15 13:30:00 +01:00
label	Add label descriptions (#3662)	2018-03-13 10:03:55 +08:00
license	Add missing licenses (#3497)	2018-02-13 07:10:40 +02:00
locale	Merge branch 'master' into feat/approval-new	2018-05-19 18:17:01 +02:00
readme	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00