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_memcache.go

Update deps

2014-09-01 00:12:37 +08:00

setting_redis.go

Update deps

2014-09-01 00:12:37 +08:00

setting.go

Merge branch 'dev' of github.com:gogits/gogs into dev

2014-09-17 12:04:18 +08:00