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
..
css	Use standard lessc and minify CSS using Node.js (#2337)	2017-09-21 11:35:11 +08:00
img	Resolved Conflicts	2017-09-12 14:19:20 +02:00
js	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-09-24 13:20:34 +02:00
less	Implementation of all repositories of a user from user->settings (#1740)	2017-09-14 14:46:14 +03:00
vendor	Resolved Conflicts	2017-09-17 21:14:02 +02:00
swagger.v1.json	Resolved Conflicts	2017-09-12 14:19:20 +02:00