diff --cc models/action.go
Simple merge
diff --cc routers/repo/http.go
Simple merge
diff --cc routers/repo/issue.go
Simple merge
author	Unknwon <u@gogs.io>
	Sun, 1 Mar 2015 02:50:29 +0000 (21:50 -0500)
committer	Unknwon <u@gogs.io>
	Sun, 1 Mar 2015 02:50:29 +0000 (21:50 -0500)
		1	2
models/action.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/repo/http.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/repo/issue.go	patch \|	diff1 \|	diff2 \|	blob \| history