Merge branch 'master' of localhost:xiaoxiao/gogs7

Conflicts:
	.gitignore
tokarchuk/v1.17
Lunny Xiao 11 years ago
commit bb71a1bc1d
  1. 1
      .gitignore

1
.gitignore vendored

@ -1,4 +1,5 @@
gogs gogs
*.exe *.exe
*.exe~ *.exe~

Loading…
Cancel
Save