Merge remote-tracking branch 'origin/plugin-system' into plugin-system
commit daf5fc434c43eea9eb93d7b2ce657be79877d090
2 parents e5bf90e + ddd5185
@Naoki Takezoe Naoki Takezoe authored on 7 Jun 2014
Showing 7 changed files
View
src/main/scala/app/SystemSettingsController.scala
View
src/main/scala/plugin/PluginSystem.scala
View
src/main/twirl/admin/menu.scala.html
View
src/main/twirl/admin/script.scala.html 0 → 100644
View
src/main/twirl/main.scala.html
View
src/main/twirl/menu.scala.html
View
src/main/webapp/assets/common/css/gitbucket.css