diff options
author | Seth Tisue <seth@tisue.net> | 2016-02-25 08:33:44 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-02-25 08:33:44 -0500 |
commit | e891bb60f721465bfe497b16f5ef440de0a7d5e5 (patch) | |
tree | edbe21ff3fd89156701c8ecedf5d900915bfb759 /scripts/jobs | |
parent | d375334c26c625da345c5e77bca2975f21b8bd10 (diff) | |
parent | 964630ec1f4cf94f4d09eff394f959e733e3fcf7 (diff) | |
download | scala-e891bb60f721465bfe497b16f5ef440de0a7d5e5.tar.gz scala-e891bb60f721465bfe497b16f5ef440de0a7d5e5.tar.bz2 scala-e891bb60f721465bfe497b16f5ef440de0a7d5e5.zip |
Merge pull request #4996 from retronym/merge/2.11.x-to-2.12.x-20160225
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'scripts/jobs')
-rw-r--r--[-rwxr-xr-x] | scripts/jobs/integrate/bootstrap | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 11cf659229..11cf659229 100755..100644 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap |