mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-01 15:52:05 +01:00
Merge branch 'master' of localhost:xiaoxiao/gogs5
Conflicts: .gitignore
This commit is contained in:
commit
9c27f8c228
Conflicts: .gitignore