Skip to content

Commit 526126b

Browse files
committed
Merge branch 'master' into update/bootswatch-yeti-3.3.7
2 parents a7961ab + 970efc8 commit 526126b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ libraryDependencies ++= Seq(
3535
"com.typesafe.play" %% "play-test" % playVersion % "test" cross CrossVersion.for3Use2_13,
3636
"com.typesafe.play" %% "play-specs2" % playVersion % "test" cross CrossVersion.for3Use2_13,
3737
"org.webjars" % "bootstrap" % "3.1.1-2" % "test",
38-
"org.webjars" % "react" % "0.12.2" % "test",
38+
"org.webjars" % "react" % "0.14.8" % "test",
3939
"org.webjars" % "bootswatch-yeti" % "3.1.1+1" % "test"
4040
)
4141

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
1+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")
22

33
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
44

5-
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
5+
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
66

77
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18")
88

0 commit comments

Comments
 (0)