Merge branch 'retry_fix_#838' of https://github.com/officer/gitbucket into officer-retry_fix_#838
# Conflicts:
#	src/main/scala/gitbucket/core/view/LinkConverter.scala
commit 9f5052819210e821f688437e98cff6186104a0c3
2 parents 4c149cf + f0268b1
@Naoki Takezoe Naoki Takezoe authored on 26 Aug 2015
Showing 2 changed files
View
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View
src/main/scala/gitbucket/core/view/LinkConverter.scala