Naoki Takezoe ab564cc2d4 Merge branch 'master' into new-plugin-system ...

Conflicts:
	src/main/scala/servlet/AutoUpdateListener.scala

2015-02-14 23:40:43 +09:00

..

build.properties

(refs #464)Switch to play-twirl

2014-08-14 18:37:37 +09:00

build.scala

Merge branch 'master' into new-plugin-system

2015-02-14 23:40:43 +09:00

plugins.sbt

Add sbt-assembly configuration

2015-01-25 02:31:21 +09:00