summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-14 11:44:01 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-14 11:44:01 -0700
commit067a4d36a6d30d6431a520c9db8ec4714f1a8675 (patch)
treedcc6577e82f8d074c4c3d3f936a3f0d3f90801f6
parent6f6fdeaea946e2cfec66bd73468a31d208b6f373 (diff)
parent861e4766da5a2271ae66d5d5fd054f6fe01ac7b9 (diff)
downloadscala-067a4d36a6d30d6431a520c9db8ec4714f1a8675.tar.gz
scala-067a4d36a6d30d6431a520c9db8ec4714f1a8675.tar.bz2
scala-067a4d36a6d30d6431a520c9db8ec4714f1a8675.zip
Skip merging #5000 from 2.11.x into 2.12.x
0 files changed, 0 insertions, 0 deletions