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 /src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala | |
| 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 'src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala index fb2bf5049f..7232892d52 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala @@ -396,7 +396,7 @@ trait EntityPage extends HtmlPage { { if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value)) - <div id="footer">Scala programming documentation. Copyright (c) 2003-2016 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div> + <div id="footer">Scala programming documentation. Copyright (c) 2003-2017 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div> else <div id="footer"> { tpl.universe.settings.docfooter.value } </div> } |