Tomofumi Tanaka
|
6acbd5b2cf
|
Merge remote-tracking branch 'origin/master' into api-support
Conflicts:
src/main/scala/ScalatraBootstrap.scala
src/main/scala/gitbucket/core/controller/AccountController.scala
src/main/scala/gitbucket/core/controller/ControllerBase.scala
src/main/scala/gitbucket/core/controller/IssuesController.scala
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
src/main/scala/gitbucket/core/model/Profile.scala
src/main/scala/gitbucket/core/service/PullRequestService.scala
src/main/scala/gitbucket/core/service/WebHookService.scala
src/main/scala/gitbucket/core/servlet/InitializeListener.scala
src/main/scala/gitbucket/core/view/helpers.scala
src/main/twirl/gitbucket/core/pulls/conversation.scala.html
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
src/main/twirl/issues/listparts.scala.html
|
2015-03-16 22:49:47 +09:00 |
|
