Merge branch 'master' into css

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into css_bootstrap3 Conflicts: src/main/twirl/gitbucket/core/account/edit.scala.html master
commit 0cdcc252e0ab797fab8584cd31f79cb4c3578708 2 parents 38e8247 + 9477cca Naoki Takezoe authored on 6 Dec 2015

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View project/build.scala

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

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

Show line notes below