Permalink
Browse files

Merge branch '2.2.x_2.10' into develop

  • Loading branch information...
2 parents fc5b9e4 + 27b7b64 commit 8420d50ec0d07cf366c5e73442854f71f29f3b88 @casualjim casualjim committed Apr 7, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 project/build.scala
View
@@ -313,7 +313,7 @@ object ScalatraBuild extends Build {
private val jettyVersion = "8.1.10.v20130312"
- private val json4sVersion = "3.2.3"
+ private val json4sVersion = "3.2.4"
private val scalateArtifact: String => String = {
case sv if sv startsWith "2.8." => "scalate-core"

0 comments on commit 8420d50

Please sign in to comment.