Merge branch 'master'

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' Conflicts: src/main/scala/gitbucket/core/servlet/AutoUpdate.scala master
commit 3d1c9bc9def94def53e16a0b81cbbfe16b1f3a5a 2 parents 5a5bf34 + 9874eb7 Naoki Takezoe authored on 24 Jan 2016

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View doc/auto_update.md

Ignore Space Show notes View doc/directory.md

Ignore Space Show notes View doc/release.md

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

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

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

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

Show line notes below