Skip to content
Browse files

Merge branch 'development' into fotoalbum

  • Loading branch information...
2 parents 53e8a04 + bb0d087 commit 9e82daba0451b6a36551534853ef2877d0a1213d @KyleRogers committed Sep 17, 2013
Showing with 3 additions and 3 deletions.
  1. +2 −2 project/Build.scala
  2. +1 −1 project/plugins.sbt
View
4 project/Build.scala
@@ -28,13 +28,13 @@ object ApplicationBuild extends Build {
// TEST DEPENDENCIES
- "play" %% "play-test" % "2.1.4" % "test",
+ "play" %% "play-test" % "2.1.2" % "test",
"org.scalatest" %% "scalatest" % "1.9.1" % "test",
"org.scalamock" %% "scalamock-scalatest-support" % "3.0.1" % "test",
"org.scalamock" %% "scalamock-specs2-support" % "3.0.1" % "test",
"jp.t2v" %% "play2.auth.test" % "0.9" % "test",
- "junit" % "junit" % "4.11" % "test",
+ "junit" % "junit-dep" % "4.11" % "test",
"info.cukes" % "cucumber-scala" % "1.1.2" % "test",
"info.cukes" % "cucumber-junit" % "1.1.2" % "test",
"org.fluentlenium" % "fluentlenium-core" % "0.8.0" % "test",
View
2 project/plugins.sbt
@@ -5,4 +5,4 @@ logLevel := Level.Warn
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
// Use the Play sbt plugin for Play projects
-addSbtPlugin("play" % "sbt-plugin" % "2.1.4")
+addSbtPlugin("play" % "sbt-plugin" % "2.1.2")

0 comments on commit 9e82dab

Please sign in to comment.
Something went wrong with that request. Please try again.