diff --cc cmd/web.go
Simple merge
diff --cc models/org.go
Simple merge
diff --cc modules/middleware/context.go
Simple merge
diff --cc modules/middleware/repo.go
Simple merge
diff --cc routers/repo/repo.go
Simple merge
author	Unknwon <u@gogs.io>
	Mon, 23 Feb 2015 03:55:35 +0000 (22:55 -0500)
committer	Unknwon <u@gogs.io>
	Mon, 23 Feb 2015 03:55:35 +0000 (22:55 -0500)
		1	2
cmd/web.go	patch \|	diff1 \|	diff2 \|	blob \| history
models/org.go	patch \|	diff1 \|	diff2 \|	blob \| history
modules/middleware/context.go	patch \|	diff1 \|	diff2 \|	blob \| history
modules/middleware/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/repo/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history