# HG changeset patch
# User Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
# Date 1620929860 -7200
# Node ID cf4c300fe036376557c6bb56727d7c4f6260d2f9
# Parent  f46982a55062a369d8a1864a8e7ecfd7b324406c
contributors: update

diff -r f46982a55062 -r cf4c300fe036 CONTRIBUTORS
--- a/CONTRIBUTORS	Fri May 14 16:44:27 2021 +0200
+++ b/CONTRIBUTORS	Thu May 13 20:17:40 2021 +0200
@@ -1,19 +1,26 @@
 List of contributors to Kallithea project:
 
-    Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 2014-2020
-    Mads Kiilerich <mads@kiilerich.com> 2016-2020
+    Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 2014-2021
+    Mads Kiilerich <mads@kiilerich.com> 2016-2021
+    ssantos <ssantos@web.de> 2018-2021
+    Private <adamantine.sword@gmail.com> 2019-2021
+    Étienne Gilli <etienne@gilli.io> 2020-2021
+    fresh <fresh190@protonmail.com> 2020-2021
+    robertus <robertuss12@gmail.com> 2020-2021
+    Eugenia Russell <eugenia.russell2019@gmail.com> 2021
+    Michalis <michalisntovas@yahoo.gr> 2021
+    vs <vsuhachev@yandex.ru> 2021
+    Александр <akonn7@mail.ru> 2021
     Asterios Dimitriou <steve@pci.gr> 2016-2017 2020
     Allan Nordhøy <epost@anotheragency.no> 2017-2020
     Anton Schur <tonich.sh@gmail.com> 2017 2020
-    ssantos <ssantos@web.de> 2018-2020
     Manuel Jacob <me@manueljacob.de> 2019-2020
-    Private <adamantine.sword@gmail.com> 2019-2020
+    Artem <kovalevartem.ru@gmail.com> 2020
     David Ignjić <ignjic@gmail.com> 2020
     Dennis Fink <dennis.fink@c3l.lu> 2020
-    Étienne Gilli <etienne@gilli.io> 2020
     J. Lavoie <j.lavoie@net-c.ca> 2020
-    robertus <robertuss12@gmail.com> 2020
     Ross Thomas <ross@lns-nevasoft.com> 2020
+    Tim Ooms <tatankat@users.noreply.github.com> 2020
     Andrej Shadura <andrew@shadura.me> 2012 2014-2017 2019
     Étienne Gilli <etienne.gilli@gmail.com> 2015-2017 2019
     Adi Kriegisch <adi@cg.tuwien.ac.at> 2019
diff -r f46982a55062 -r cf4c300fe036 docs/conf.py
--- a/docs/conf.py	Fri May 14 16:44:27 2021 +0200
+++ b/docs/conf.py	Thu May 13 20:17:40 2021 +0200
@@ -47,7 +47,7 @@
 
 # General information about the project.
 project = 'Kallithea'
-copyright = '2010-2020 by various authors, licensed as GPLv3.'
+copyright = '2010-2021 by various authors, licensed as GPLv3.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff -r f46982a55062 -r cf4c300fe036 kallithea/templates/about.html
--- a/kallithea/templates/about.html	Fri May 14 16:44:27 2021 +0200
+++ b/kallithea/templates/about.html	Thu May 13 20:17:40 2021 +0200
@@ -24,20 +24,27 @@
   necessarily limited to the following:</p>
   <ul>
 
-  <li>Copyright &copy; 2012&ndash;2020, Mads Kiilerich</li>
-  <li>Copyright &copy; 2014&ndash;2020, Thomas De Schampheleire</li>
-  <li>Copyright &copy; 2015&ndash;2017, 2019&ndash;2020, Étienne Gilli</li>
+  <li>Copyright &copy; 2012&ndash;2021, Mads Kiilerich</li>
+  <li>Copyright &copy; 2014&ndash;2021, Thomas De Schampheleire</li>
+  <li>Copyright &copy; 2015&ndash;2017, 2019&ndash;2021, Étienne Gilli</li>
+  <li>Copyright &copy; 2018&ndash;2021, ssantos</li>
+  <li>Copyright &copy; 2019&ndash;2021, Private</li>
+  <li>Copyright &copy; 2020&ndash;2021, fresh</li>
+  <li>Copyright &copy; 2020&ndash;2021, robertus</li>
+  <li>Copyright &copy; 2021, Eugenia Russell</li>
+  <li>Copyright &copy; 2021, Michalis</li>
+  <li>Copyright &copy; 2021, vs</li>
+  <li>Copyright &copy; 2021, Александр</li>
   <li>Copyright &copy; 2016&ndash;2017, 2020, Asterios Dimitriou</li>
   <li>Copyright &copy; 2017&ndash;2020, Allan Nordhøy</li>
   <li>Copyright &copy; 2017, 2020, Anton Schur</li>
-  <li>Copyright &copy; 2018&ndash;2020, ssantos</li>
   <li>Copyright &copy; 2019&ndash;2020, Manuel Jacob</li>
-  <li>Copyright &copy; 2019&ndash;2020, Private</li>
+  <li>Copyright &copy; 2020, Artem</li>
   <li>Copyright &copy; 2020, David Ignjić</li>
   <li>Copyright &copy; 2020, Dennis Fink</li>
   <li>Copyright &copy; 2020, J. Lavoie</li>
-  <li>Copyright &copy; 2020, robertus</li>
   <li>Copyright &copy; 2020, Ross Thomas</li>
+  <li>Copyright &copy; 2020, Tim Ooms</li>
   <li>Copyright &copy; 2012, 2014&ndash;2017, 2019, Andrej Shadura</li>
   <li>Copyright &copy; 2019, Adi Kriegisch</li>
   <li>Copyright &copy; 2019, Danni Randeris</li>
diff -r f46982a55062 -r cf4c300fe036 kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html	Fri May 14 16:44:27 2021 +0200
+++ b/kallithea/templates/base/base.html	Thu May 13 20:17:40 2021 +0200
@@ -23,7 +23,7 @@
             <a class="navbar-link" href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
         %endif
         which is
-        <a class="navbar-link" href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2020 by various authors &amp; licensed under GPLv3</a>.
+        <a class="navbar-link" href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2021 by various authors &amp; licensed under GPLv3</a>.
         %if c.issues_url:
             &ndash; <a class="navbar-link" href="${c.issues_url}" target="_blank">${_('Support')}</a>
         %endif