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

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' of https://github.com/takezoe/gitbucket.git Conflicts: src/main/scala/app/DashboardController.scala master
commit 0296a0bde6a2bee864d367107cf0f19cd0743448 2 parents 8409384 + cfaee56 shimamoto authored on 30 Jul 2013

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View sbt.bat

Ignore Space Show notes View src/main/scala/app/AccountController.scala

Ignore Space Show notes View src/main/scala/app/DashboardController.scala

Ignore Space Show notes View src/main/scala/app/IndexController.scala

Ignore Space Show notes View src/main/scala/app/RepositoryViewerController.scala

Ignore Space Show notes View src/main/scala/service/RepositoryService.scala

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

Ignore Space Show notes View src/main/scala/view/AvatarImageProvider.scala

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

Ignore Space Show notes View src/main/twirl/repo/tab.scala.html

Show line notes below