Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| admin | ||
| api/v1 | ||
| dev | ||
| org | ||
| repo | ||
| user | ||
| home.go | ||
| install.go | ||
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| admin | ||
| api/v1 | ||
| dev | ||
| org | ||
| repo | ||
| user | ||
| home.go | ||
| install.go | ||