Merge branch 'master' into dependency

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into dependency_updates master
commit 7917483dfc164f90dc550a9838104a283a583cd5 2 parents c0a2c8a + 9faa3e8 aadrian authored on 4 May 2017 GitHub committed on 4 May 2017

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View build.sbt

Ignore Space Show notes View src/main/scala/gitbucket/core/GitBucketCoreModule.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ControllerBase.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/helper/preview.scala.html

Show line notes below