7ccab9cd09
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
---|---|---|
.. | ||
setting_memcache.go | ||
setting_redis.go | ||
setting.go |
7ccab9cd09
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
---|---|---|
.. | ||
setting_memcache.go | ||
setting_redis.go | ||
setting.go |