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 |
---|
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala |
---|
src/main/scala/gitbucket/core/util/JGitUtil.scala |
---|
src/main/scala/gitbucket/core/view/helpers.scala |
---|
src/main/twirl/gitbucket/core/repo/blob.scala.html |
---|
src/main/webapp/assets/common/css/gitbucket.css |
---|