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
..
draw.js	add scroolbars to wide graphs. (#608)	2017-01-22 20:10:01 +08:00
index.js	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00