GitBucket
|
Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar
# Conflicts: # src/main/twirl/gitbucket/core/wiki/page.scala.html |
|---|
|
|
| src/main/scala/gitbucket/core/controller/WikiController.scala |
|---|
| src/main/scala/gitbucket/core/service/WikiService.scala |
|---|
| src/main/twirl/gitbucket/core/wiki/page.scala.html |
|---|
| src/main/webapp/assets/common/css/gitbucket.css |
|---|