Merge branch 'master' of localhost:xiaoxiao/gogs6
Conflicts: .gitignore
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
|
||||
gogs
|
||||
*.exe
|
||||
*.exe~
|
||||
|
||||
Reference in New Issue
Block a user
Conflicts: .gitignore
@@ -1,3 +1,4 @@
|
||||
|
||||
gogs
|
||||
*.exe
|
||||
*.exe~
|
||||
|
||||