Skip to content

Commit f470dea

Browse files
committed
Merge '0.6.x' into 'master'.
Only trivial merge conflicts. Additionally, the partest `run/t1430` and `run/t4729` are moved to the blacklist in 2.12.2 and 2.13.0-M1. This brings those two versions up to par with 2.12.0 and 2.12.1, for which they had been blacklisted in 497e463.
2 parents 62559a7 + 34ddcb6 commit f470dea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sbt-plugin-test/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version := scalaJSVersion
1313

1414
val versionSettings = Seq(
1515
version := scalaJSVersion,
16-
scalaVersion := "2.11.8"
16+
scalaVersion := "2.11.11"
1717
)
1818

1919
val baseSettings = versionSettings ++ Seq(

0 commit comments

Comments
 (0)