kolaente c0cd0c3710 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # options/locale/locale_en-US.ini		2018-04-29 11:25:56 +02:00
..
v1	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-04-29 11:25:56 +02:00