Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| miscellaneous.go | ||
| repo_file.go | ||
| repo_hooks.go | ||
| repo.go | ||
| user_app.go | ||
| user.go | ||
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| miscellaneous.go | ||
| repo_file.go | ||
| repo_hooks.go | ||
| repo.go | ||
| user_app.go | ||
| user.go | ||