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