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