lunnyxiao 061a879cea Merge branch 'dev' of github.com:gogits/gogs into dev ... Conflicts: conf/app.ini		2014-09-17 12:04:18 +08:00
..
setting.go	Merge branch 'dev' of github.com:gogits/gogs into dev	2014-09-17 12:04:18 +08:00
setting_memcache.go
setting_redis.go