1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-31 22:58:35 +00:00

Merge branch 'master' of localhost:xiaoxiao/gogs3

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

2
.gitignore vendored
View File

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