Brock Angelo
36996dad0aaa7cdc67642eae7a61fc90fb1fbaf7
36996dad0aaa7cdc67642eae7a61fc90fb1fbaf7
resolve merge conflict
20 Jan 2016
Luigi Marini
40734fced13f0840d45a86bffd360087ff786c1b
m 40734fced13f0840d45a86bffd360087ff786c1b
Replacing local sbt jar to 0.13.2 just in case
In case some of the build script uses the local sbt jar instead of the
one on the path rizzo:/usr/local/sbt-0.13.2/bin
16 Dec 2015
Luigi Marini
cd919a2c09378134d8022c3f0b1979173d977082
m cd919a2c09378134d8022c3f0b1979173d977082
sbt 0.13.2
Trying this version since that's what on the build machine
16 Dec 2015
Luigi Marini
17310b7e9a92f07a95cabe23bc4ab796743e6262
m 17310b7e9a92f07a95cabe23bc4ab796743e6262
Upgraded play and sbt to get build to work with java 1.8
play 2.2.6
sbt 0.13.9
16 Dec 2015
Brock Angelo
645739796f14b73ece4aee644ca4e1266c3d1612
m 645739796f14b73ece4aee644ca4e1266c3d1612
update the build script
16 Dec 2015