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
..
branches.tmpl	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00
collaboration.tmpl	Use Semantic UI's Search component for user and repo search (#2636)	2017-10-03 06:27:48 +03:00
deploy_keys.tmpl	Simplify settings pages with item list (#1389)	2017-03-30 09:02:37 +08:00
githook_edit.tmpl	Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270)	2017-03-15 23:39:38 +01:00
githooks.tmpl	Fix #1418 (#1456)	2017-04-07 22:50:40 +08:00
hook_delete_modal.tmpl	Indent all templates with tabs	2015-12-08 00:57:46 +01:00
hook_discord.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hook_gitea.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hook_gogs.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hook_history.tmpl	Fix #1418 (#1456)	2017-04-07 22:50:40 +08:00
hook_list.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hook_new.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hook_settings.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
hook_slack.tmpl	Fixed project on repo template hook settings	2016-12-02 07:46:02 +01:00
hooks.tmpl	Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270)	2017-03-15 23:39:38 +01:00
nav.tmpl	Protected branches system (#339)	2017-02-21 23:02:10 +08:00
navbar.tmpl	Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270)	2017-03-15 23:39:38 +01:00
options.tmpl	Moved languagestrings to ini	2017-09-17 21:14:01 +02:00
protected_branch.tmpl	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00