Unknwon 5a7bca797c Merge branch 'dev' of github.com:gogits/gogs into access ...

Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl

2015-02-22 22:51:25 -05: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 access

2015-02-22 22:51:25 -05:00