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