Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| alert.tmpl | ||
| footer.tmpl | ||
| head.tmpl | ||
| header.tmpl | ||
| social.tmpl | ||
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| alert.tmpl | ||
| footer.tmpl | ||
| head.tmpl | ||
| header.tmpl | ||
| social.tmpl | ||