diff options
Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
gogs.go
models/models.go
models/user.go
templates/.VERSION
templates/org/home.tmpl
Diffstat (limited to 'modules/auth/user_form.go')
1 files changed, 1 insertions, 1 deletions