Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| cert_stub.go | ||
| cert.go | ||
| dump.go | ||
| serve.go | ||
| update.go | ||
| web.go | ||
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
|---|---|---|
| .. | ||
| cert_stub.go | ||
| cert.go | ||
| dump.go | ||
| serve.go | ||
| update.go | ||
| web.go | ||