diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:45:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:48:26 +1000 |
| commit | 964630ec1f4cf94f4d09eff394f959e733e3fcf7 (patch) | |
| tree | edbe21ff3fd89156701c8ecedf5d900915bfb759 /CONTRIBUTING.md | |
| parent | d375334c26c625da345c5e77bca2975f21b8bd10 (diff) | |
| parent | e0fc92a2b7b27141b41cecafd3ec7804ad02707b (diff) | |
| download | scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.gz scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.bz2 scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160225
Conflicts:
scripts/jobs/integrate/bootstrap
src/build/maven/scala-actors-pom.xml
test/files/pos/t3420.flags
Conflicts were trivial to resolve.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 462b5404b2..18f07376bd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,11 +10,11 @@ We are super happy about this, and are eager to make your experience contributin This is why we're collecting these notes on how to contribute, and we hope you'll share your experience to improve the process for the next contributor! (Feel free to send a PR for this note, send your thoughts to scala-internals, or tweet about it to @adriaanm.) -By the way, the team at Typesafe is: @adriaanm, @lrytz, @retronym, and @SethTisue. +By the way, the team at Lightbend (formerly Typesafe) is: @adriaanm, @lrytz, @retronym, @SethTisue, and @szeiger. ## What kind of PR are you submitting? -Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala), to protect the OSS nature of the code base. +Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala), to protect the OSS nature of the code base. You don't need to submit separate PRs for 2.11.x, 2.12.x, and 2.13.x. Any changes accepted on one of these branches will, in time, be merged into the later branches. |