mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-10 13:31:01 -05:00
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts: dockerfiles/README.md
This commit is contained in:
Conflicts: dockerfiles/README.md