diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-07 16:35:46 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2017-04-07 16:35:46 -0700 |
| commit | cadb005bf775930f431efd50e6bd062614e0ef24 (patch) | |
| tree | 9890b120e898f1f1a6cb185002b9e7ac3a2ad506 /doc/LICENSE.md | |
| parent | 15123a1b0bb5ac8b4668a9db754e2502e1c0ba8b (diff) | |
| parent | 828a8923c4f1c6c6c884a18675e2effa91c73197 (diff) | |
| download | scala-cadb005bf775930f431efd50e6bd062614e0ef24.tar.gz scala-cadb005bf775930f431efd50e6bd062614e0ef24.tar.bz2 scala-cadb005bf775930f431efd50e6bd062614e0ef24.zip | |
Merge 2.11.x into 2.12.x
Include 828a892 Merge pull request #5753
Diffstat (limited to 'doc/LICENSE.md')
| -rw-r--r-- | doc/LICENSE.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md index a07ba32e0b..2c79713f36 100644 --- a/doc/LICENSE.md +++ b/doc/LICENSE.md @@ -2,9 +2,9 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license ## Scala License -Copyright (c) 2002-2016 EPFL +Copyright (c) 2002-2017 EPFL -Copyright (c) 2011-2016 Lightbend, Inc. +Copyright (c) 2011-2017 Lightbend, Inc. All rights reserved. |