7ccab9cd09
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
---|---|---|
.. | ||
auth.go | ||
home.go | ||
setting.go | ||
social.go |
7ccab9cd09
Conflicts: gogs.go models/models.go models/user.go templates/.VERSION templates/org/home.tmpl |
||
---|---|---|
.. | ||
auth.go | ||
home.go | ||
setting.go | ||
social.go |