| Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl | ||
|---|---|---|
| .. | ||
| base | ||
| member | ||
| settings | ||
| team | ||
| create.tmpl | ||
| home.tmpl | ||
| new.tmpl | ||
| Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl | ||
|---|---|---|
| .. | ||
| base | ||
| member | ||
| settings | ||
| team | ||
| create.tmpl | ||
| home.tmpl | ||
| new.tmpl | ||