Merge branch 'master' of localhost:xiaoxiao/gogs6

Conflicts:
	.gitignore
This commit is contained in:
Lunny Xiao committed 2014-03-25 18:14:13 +08:00
commit 2ec111e1a2
2 files changed
+3 -1

No files matched your search

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