diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-08 10:13:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 10:13:21 -0700 |
commit | 1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (patch) | |
tree | 504be1953b98540b72cf4932b66a1c1143f4f00a /src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala | |
parent | 2261f3ef4f7b2e0d14b3c2463db5878029bc5d8e (diff) | |
parent | 0d88720aea13c3a1f136f0caa7346eefe64610ec (diff) | |
download | scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.gz scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.bz2 scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.zip |
Merge pull request #5837 from adriaanm/merge-2.11.x-into-2.12.x
Catch up with 2.11.x
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> } |