Justin Nuß 91480f3791 Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281 ... Conflicts: modules/base/tool.go		2014-07-26 11:23:58 +02:00
..
setting_memcache.go	Fixed #209	2014-05-25 20:17:26 -04:00
setting_redis.go	Fixed #209	2014-05-25 20:17:26 -04:00
setting.go	Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281	2014-07-26 11:23:58 +02:00