Merge branch 'master' of localhost:xiaoxiao/gogs7

Conflicts: .gitignore
10 years ago · bb71a1bc1d
parent 19b7f74b75 01b3b7004d
commit bb71a1bc1d
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@

+
 gogs
 *.exe
 *.exe~