kolaente 37dc550bc8 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # docs/content/doc/advanced/config-cheat-sheet.en-us.md # models/migrations/migrations.go # models/migrations/v54.go # routers/repo/pull.go		2018-01-06 22:41:44 +01:00
..
config-cheat-sheet.en-us.md	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-01-06 22:41:44 +01:00
config-cheat-sheet.zh-cn.md	add external tool docs (#3301)	2018-01-06 05:28:31 -06:00
customizing-gitea.en-us.md	Reduce overhead of upgrades for users with custom stylesheets/JS (#3051)	2017-12-03 02:26:06 +02:00
hacking-on-gitea.en-us.md
hacking-on-gitea.zh-cn.md
make.en-us.md
make.fr-fr.md	French translation for docs (#3030)	2017-11-30 20:45:48 +08:00
specific-variables.en-us.md