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 |
---|
src/main/scala/app/PullRequestsController.scala |
---|
src/main/scala/service/PullRequestService.scala |
---|
src/main/scala/servlet/GitRepositoryServlet.scala |
---|