Konrad Langenberg 8b4a48c4bc Merge branch 'master' of https://github.com/go-gitea/gitea ... Signed-off-by: Konrad <konrad@kola-entertainments.de> # Conflicts: # models/migrations/migrations.go # models/migrations/v42.go		2017-09-24 13:20:34 +02:00
..
gitignore	Synced gitignores with github repo (#1245)	2017-03-15 13:30:00 +01:00
label	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00
license	Synced licenses with github repo (#1246)	2017-03-15 13:30:16 +01:00
locale	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-09-24 13:20:34 +02:00
readme	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00