Merge remote-tracking branch 'upstream/master' into pr-multi-mailaddress

Fork: 0

Gatewify / GitBucket

Browse code Merge remote-tracking branch 'upstream/master' into pr-multi-mailaddress # Conflicts: # src/main/scala/gitbucket/core/GitBucketCoreModule.scala patch-3 test 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.29.0 4.28.0 4.27.0 4.26.0 4.25.0 4.24.1 4.24.0 1.0.0
commit cc091a65a4e7ecc2fe24f4aaddc6c98ca20c65c9 2 parents 884d493 + 35655f3 KOUNOIKE Yuusuke authored on 15 Apr 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View CHANGELOG.md

Ignore Space Show notes View README.md

Ignore Space Show notes View build.sbt

Ignore Space Show notes View project/build.properties

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

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

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

Show line notes below