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
..
admin	Resolved Conflicts	2017-09-12 14:19:20 +02:00
base	Fix duplicated rel attribute (#2549)	2017-09-20 07:20:11 +03:00
explore	Resolved Conflicts	2017-09-12 14:19:20 +02:00
mail	xxx_active_code_live setting in printed in hours and minutes instead … (#1814)	2017-05-29 02:35:47 -05:00
org	Resolved Conflicts	2017-09-12 14:19:20 +02:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-09-24 13:20:34 +02:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	Complete push webhooks (#2530)	2017-09-21 10:43:26 +03:00
home.tmpl	docs: update translation on homepage for zh-tw (#634)	2017-01-11 09:23:42 +01:00
install.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
swagger.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00