Merge branch 'master' of localhost:xiaoxiao/gogs3

Conflicts:
	.gitignore
	LICENSE
release/v1.15
Lunny Xiao 2014-03-25 17:19:02 +08:00
commit fcbe7ef5c1
2 changed files with 2 additions and 2 deletions