Merge branch 'master' of https://github.com/takezoe/gitbucket

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' of https://github.com/takezoe/gitbucket master
commit d6e2bc464d7956e7a72eaca52ea969509d55034e 2 parents 5124ff5 + 727c90a Naoki Takezoe authored on 3 Apr 2015

Patch

Unified Split

Showing 5 changed files

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

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

Ignore Space Show notes View src/test/scala/gitbucket/core/service/MergeServiceSpec.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/util/GitSpecUtil.scala 0 → 100644

Ignore Space Show notes View src/test/scala/gitbucket/core/util/JGitUtilSpec.scala 0 → 100644

Show line notes below