mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 00:54:28 +00:00
Merge branch 'master' of localhost:xiaoxiao/gogs7
Conflicts: .gitignore
This commit is contained in:
commit
bb71a1bc1d
Conflicts: .gitignore