Merge branch 'master' into pr-api-pr-merged

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into pr-api-pr-merged master
commit c7d46ee18f54ce544608dae012d6f120033da6e8 2 parents f073112 + eafdd0f Naoki Takezoe authored on 5 Aug 2017 GitHub committed on 5 Aug 2017

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View build.sbt

Ignore Space Show notes View plugins.json

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

Show line notes below