diff --cc models/issue.go
Simple merge
diff --cc models/repo.go
Simple merge
diff --cc routers/repo/issue.go
Simple merge
author	无闻 <u@gogs.io>
	Wed, 11 Feb 2015 17:43:13 +0000 (12:43 -0500)
committer	无闻 <u@gogs.io>
	Wed, 11 Feb 2015 17:43:13 +0000 (12:43 -0500)
		1	2
models/issue.go	patch \|	diff1 \|	diff2 \|	blob \| history
models/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history
routers/repo/issue.go	patch \|	diff1 \|	diff2 \|	blob \| history