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
..
advanced	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-01-06 22:41:44 +01:00
features	Update docs for LDAP (via BindDN) user sync option. (#2985)	2017-11-30 21:36:53 +08:00
help
installation	add quotation around ports in docker-compose.yml (#3090)	2017-12-05 14:03:40 +08:00
upgrade	French translation for docs (#3030)	2017-11-30 20:45:48 +08:00
usage
advanced.en-us.md
advanced.fr-fr.md	French translation for docs (#3030)	2017-11-30 20:45:48 +08:00
advanced.zh-cn.md
features.en-us.md
features.zh-cn.md
features.zh-tw.md
help.zh-cn.md
installation.en-us.md
installation.fr-fr.md	French translation for docs (#3030)	2017-11-30 20:45:48 +08:00
installation.zh-cn.md
installation.zh-tw.md
upgrade.en-us.md
upgrade.fr-fr.md	French translation for docs (#3030)	2017-11-30 20:45:48 +08:00
upgrade.zh-cn.md
upgrade.zh-tw.md
usage.en-us.md