Merge branch 'master' into plugin-system
commit 6f666ca49f2a62c5cb89d4526f67d1d268c537df
2 parents 0cb2116 + 2801134
@Naoki Takezoe Naoki Takezoe authored on 5 Jun 2014
Showing 2 changed files
View
src/main/twirl/main.scala.html
View
src/main/twirl/wiki/page.scala.html