Naoki Takezoe 09fcf9c003 Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar ...

# Conflicts:
#	src/main/twirl/gitbucket/core/wiki/page.scala.html

2016-01-01 22:45:54 +09:00

..

assets

Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar

2016-01-01 22:45:54 +09:00

WEB-INF

Change package name

2015-03-02 22:15:56 +09:00