diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-08-05 10:57:07 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-08-05 10:57:07 -0700 |
| commit | effb1024af61ea0a2ee15ebd67d16e9e5c96f538 (patch) | |
| tree | 7f2d42febc15cb6689b35809aa5da2387293382a /src/scaladoc | |
| parent | 462e22d2f25bb9432c5a1e7bf20f391e6424f7a9 (diff) | |
| parent | 4c6dcfe9341d2db47a0b0a567f5646fb9d573020 (diff) | |
| download | scala-effb1024af61ea0a2ee15ebd67d16e9e5c96f538.tar.gz scala-effb1024af61ea0a2ee15ebd67d16e9e5c96f538.tar.bz2 scala-effb1024af61ea0a2ee15ebd67d16e9e5c96f538.zip | |
Merge commit '4c6dcfe934' into 2.12.x
Diffstat (limited to 'src/scaladoc')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala index 7978cbd137..743c2a401c 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala @@ -280,7 +280,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp { if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value)) - <div id="footer">Scala programming documentation. Copyright (c) 2003-2013 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://typesafe.com" target="_top">Typesafe</a>.</div> + <div id="footer">Scala programming documentation. Copyright (c) 2003-2015 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://typesafe.com" target="_top">Typesafe</a>.</div> else <div id="footer"> { tpl.universe.settings.docfooter.value } </div> } |