Konrad Langenberg 30fe97a55e 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/v46.go # models/repo.go # public/js/index.js		2017-10-30 21:17:36 +01:00
..
admin	Add commit count caching (#2774)	2017-10-26 09:37:33 +08:00
api/v1	Make URL scheme unambiguous (#2408)	2017-10-30 10:04:25 +08:00
dev	Make time diff translatable (#2057)	2017-06-28 13:43:28 +08:00
org	Remove direct user adding to organization members (#2641)	2017-10-15 10:24:24 +08:00
private	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
routes	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
user	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
home.go	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00
init.go	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
install.go	Feature: Timetracking (#2211)	2017-09-12 09:48:13 +03:00