Merge branch 'pullreq-update-in-push' of https://github.com/odz/gitbucket into odz-pullreq-update-in-push
Conflicts:
	src/main/scala/app/PullRequestsController.scala
commit 7e10618ceb56b3a1c5d175558b05a47865901402
2 parents 7f4def6 + 223ba79
@takezoe takezoe authored on 29 Nov 2013
Showing 3 changed files
View
src/main/scala/app/PullRequestsController.scala
View
src/main/scala/service/PullRequestService.scala
View
src/main/scala/servlet/GitRepositoryServlet.scala