Merge pull request #1829 from ethantkoenig/no_branches

author Andrey Nering <andrey.nering@gmail.com>

Mon, 12 Jun 2017 14:05:01 +0000 (11:05 -0300)

committer GitHub <noreply@github.com>

Mon, 12 Jun 2017 14:05:01 +0000 (11:05 -0300)
author Andrey Nering <andrey.nering@gmail.com>
Mon, 12 Jun 2017 14:05:01 +0000 (11:05 -0300)
committer GitHub <noreply@github.com>
Mon, 12 Jun 2017 14:05:01 +0000 (11:05 -0300)
diff --cc models/action.go
Simple merge
diff --cc modules/context/repo.go
Simple merge
author	Andrey Nering <andrey.nering@gmail.com>
	Mon, 12 Jun 2017 14:05:01 +0000 (11:05 -0300)
committer	GitHub <noreply@github.com>
	Mon, 12 Jun 2017 14:05:01 +0000 (11:05 -0300)
		1	2
models/action.go	patch \|	diff1 \|	diff2 \|	blob \| history
modules/context/repo.go	patch \|	diff1 \|	diff2 \|	blob \| history