Merge branch 'feature/blame' of https://github.com/team-lab/gitbucket into team-lab-feature/blame
# Conflicts:
#	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
#	src/main/webapp/assets/common/css/gitbucket.css
commit 04e31c5b4ff682c102d24a1d49deeee706ff982d
2 parents 6470428 + d8d18ed
@Naoki Takezoe Naoki Takezoe authored on 24 May 2015
Showing 5 changed files
View
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View
src/main/scala/gitbucket/core/util/JGitUtil.scala
View
src/main/scala/gitbucket/core/view/helpers.scala
View
src/main/twirl/gitbucket/core/repo/blob.scala.html
View
src/main/webapp/assets/common/css/gitbucket.css