Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts:
	.gitignore
	LICENSE
This commit is contained in:
Lunny Xiao committed 2014-03-25 17:19:02 +08:00
commit fcbe7ef5c1
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -32,4 +32,4 @@ _cgo_export.*
_testmain.go
*.exe
*.exe