Merge branch 'webhook-content-type' of https://github.com/McFoggy/gitbucket into McFoggy-webhook-content-type
...
# Conflicts:
# src/main/scala/gitbucket/core/service/WebHookService.scala
# src/main/twirl/gitbucket/core/settings/edithooks.scala.html
Naoki Takezoe
committed
on 15 Apr 2016