Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| auth | ||
| dashboard | ||
| settings | ||
| issues.tmpl | ||
| profile.tmpl | ||
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| auth | ||
| dashboard | ||
| settings | ||
| issues.tmpl | ||
| profile.tmpl | ||