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