diff --cc cmd/serve.go
Simple merge
diff --cc models/repo.go
Simple merge
diff --cc modules/setting/setting.go
Simple merge
author	无闻 <u@gogs.io>
	Mon, 9 Feb 2015 01:22:02 +0000 (20:22 -0500)
committer	无闻 <u@gogs.io>
	Mon, 9 Feb 2015 01:22:02 +0000 (20:22 -0500)
		1	2
cmd/serve.go	patch \|	diff1 \|	diff2 \|	blob \| history
models/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history
modules/setting/setting.go	patch \|	diff1 \|	diff2 \|	blob \| history