kolaente cf6d426e09 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/v68.go		2018-07-06 23:51:49 +02:00
..
api-usage.en-us.md	Create api-usage doc page (#4306)	2018-06-25 20:12:46 +08:00
config-cheat-sheet.en-us.md	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-07-06 23:51:49 +02:00
config-cheat-sheet.zh-cn.md	add git timeout settings docs (#4383)	2018-07-06 08:49:37 +03:00
customizing-gitea.en-us.md	Add the ability to have built in themes in Gitea (#4198)	2018-07-05 17:25:04 -04:00
hacking-on-gitea.en-us.md	General documentation cleanup (#3317)	2018-01-08 23:48:42 +01:00
hacking-on-gitea.zh-cn.md	Import docs into main repository (#2874)	2017-11-26 23:44:32 +02:00
make.en-us.md	General documentation cleanup (#3317)	2018-01-08 23:48:42 +01:00
make.fr-fr.md	General documentation cleanup (#3317)	2018-01-08 23:48:42 +01:00
specific-variables.en-us.md	General documentation cleanup (#3317)	2018-01-08 23:48:42 +01:00