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
..
assets	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
plugins	Re-added autolink	2017-10-10 23:02:12 +02:00
librejs.html	Resolved Conflicts	2017-09-12 14:19:20 +02:00
VERSIONS	Resolved Conflicts	2017-09-12 14:19:20 +02:00