Merge remote-tracking branch 'upstream/master'

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge remote-tracking branch 'upstream/master' master
commit 6bfe3ea760cff954e34306cf1127e749b92f97a9 2 parents 9891426 + d5e4553 conradlink authored on 23 Sep 2016

Patch

Unified Split

Showing 4 changed files

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/issues.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/dashboard/pulls.scala.html

Show line notes below