Merge branch 'master' of localhost:xiaoxiao/gogs7

Conflicts:
	.gitignore
This commit is contained in:
Lunny Xiao 2014-03-25 18:27:56 +08:00
commit bb71a1bc1d

1
.gitignore vendored
View File

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