Konrad Langenberg d7a2ffcc69 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/v44.go		2017-10-04 23:15:30 +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	Use Semantic UI's Search component for user and repo search (#2636)	2017-10-03 06:27:48 +03:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-04 23:15:30 +02:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	hide navbar when only 1 sign-in method is available (#2648)	2017-10-04 19:57:00 +03:00
home.tmpl	Link to gitea-specific Vagrant example (#2624)	2017-09-30 08:50:19 +08: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