Merge branch 'master' of localhost:xiaoxiao/gogs6

Conflicts:
	.gitignore
This commit is contained in:
2014-03-25 18:14:13 +08:00
2 changed files with 3 additions and 1 deletions

1
.gitignore vendored
View File

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