Merge branch 'master' into pr-add-release

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into pr-add-release master
commit bb188ec94823914b6e295455625a3be6525124f4 2 parents 33d82be + 281522f Naoki Takezoe authored on 13 Jan 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View project/build.properties

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

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/dbviewer.scala.html

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

Show line notes below