mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-04 14:46:57 -05:00
Merge branch 'master' of github.com:gogits/gogs
Conflicts: models/action.go
This commit is contained in:
commit
8bbaf9550a
Conflicts: models/action.go