kolaente 32db1b36f5 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/migrations.go # models/migrations/v57.go		2018-02-19 08:33:31 +01:00
..
doc	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-02-19 08:33:31 +01:00
page	Fix app.ini sample file link in docs (#3529)	2018-02-18 22:38:50 +08:00