# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2018-03-17 22:47:48
# Node ID 3b36ca51151834662c23d0200f24d2a5c2a16b51
# Parent  b4a5632733d9ca349f7869201ea4df5fe395a314

contributors: update

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,12 +1,13 @@
 List of contributors to Kallithea project:
 
+    Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> 2014-2018
+    Branko Majic <branko@majic.rs> 2015 2018
+    Mads Kiilerich <mads@kiilerich.com> 2016-2018
     Mads Kiilerich <madski@unity3d.com> 2012-2017
     Unity Technologies 2012-2017
     Andrew Shadura <andrew@shadura.me> 2012 2014-2017
     Dominik Ruf <dominikruf@gmail.com> 2012 2014 2016-2017
-    Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> 2014-2017
     Sam Jaques <sam.jaques@me.com> 2015 2017
-    Mads Kiilerich <mads@kiilerich.com> 2016-2017
     Ching-Chen Mao <mao@lins.fju.edu.tw> 2017
     FUJIWARA Katsunori <foozy@lares.dti.ne.jp> 2017
     Viktar Vauchkevich <victorenator@gmail.com> 2017
@@ -25,7 +26,6 @@ List of contributors to Kallithea projec
     Andrew Bartlett <abartlet@catalyst.net.nz> 2015
     Balázs Úr <urbalazs@gmail.com> 2015
     Ben Finney <ben@benfinney.id.au> 2015
-    Branko Majic <branko@majic.rs> 2015
     Daniel Hobley <danielh@unity3d.com> 2015
     David Avigni <david.avigni@ankapi.com> 2015
     Denis Blanchette <dblanchette@coveo.com> 2015
diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html
--- a/kallithea/templates/about.html
+++ b/kallithea/templates/about.html
@@ -27,11 +27,12 @@
   necessarily limited to the following:
   <ul style="margin: 0 0 0 50px;">
 
-  <li>Copyright &copy; 2012&ndash;2017, Mads Kiilerich</li>
+  <li>Copyright &copy; 2012&ndash;2018, Mads Kiilerich</li>
+  <li>Copyright &copy; 2014&ndash;2018, Thomas De Schampheleire</li>
+  <li>Copyright &copy; 2015, 2018, Branko Majic</li>
   <li>Copyright &copy; 2012&ndash;2017, Unity Technologies</li>
   <li>Copyright &copy; 2012, 2014&ndash;2017, Andrew Shadura</li>
   <li>Copyright &copy; 2012, 2014, 2016&ndash;2017, Dominik Ruf</li>
-  <li>Copyright &copy; 2014&ndash;2017, Thomas De Schampheleire</li>
   <li>Copyright &copy; 2015, 2017, Sam Jaques</li>
   <li>Copyright &copy; 2017, Ching-Chen Mao</li>
   <li>Copyright &copy; 2017, FUJIWARA Katsunori</li>
@@ -51,7 +52,6 @@
   <li>Copyright &copy; 2015, Andrew Bartlett</li>
   <li>Copyright &copy; 2015, Balázs Úr</li>
   <li>Copyright &copy; 2015, Ben Finney</li>
-  <li>Copyright &copy; 2015, Branko Majic</li>
   <li>Copyright &copy; 2015, Daniel Hobley</li>
   <li>Copyright &copy; 2015, David Avigni</li>
   <li>Copyright &copy; 2015, Denis Blanchette</li>
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -25,7 +25,7 @@
                    <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
                %endif
                which is
-               <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2017 by various authors &amp; licensed under GPLv3</a>.
+               <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2018 by various authors &amp; licensed under GPLv3</a>.
                %if c.issues_url:
                    &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
                %endif