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
..
css	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
img	Add Safari pinned tab icon (#2799)	2017-10-28 20:01:42 -05:00
js	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
less	Code/repo search (#2582)	2017-10-27 09:10:54 +03:00
vendor	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
swagger.v1.json	Add search mode option to /api/repo/search (#2756)	2017-10-27 00:16:13 +03:00