Merge branch 'master' into 2.1

nadineproject · Jan 3, 2019 · 5bffbe3 · 5bffbe3
2 parents 358ce7e + 95ef6ba
commit 5bffbe3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/member/templates/member/base.html b/member/templates/member/base.html
@@ -187,7 +187,7 @@
     <div class="footer-copyright setwidth container">
       {% block upperfooter %}
         <div id="copyright">
-          © 2018 |  Office Nomads | <a id='nadine-link' href="http://nadineproject.org/" target="_new">The Nadine Project</a>
+          © 2019 |  Office Nomads | <a id='nadine-link' href="http://nadineproject.org/" target="_new">The Nadine Project</a>
         </div>
       {% endblock %}
       {% block lowerfooter %}

diff --git a/staff/templates/staff/base.html b/staff/templates/staff/base.html
@@ -256,7 +256,7 @@
 	<!-- Footer -->
 	<div id="footer" style="bottom:0; right:0; left:0; position:fixed; z-index:1000;">
 		{% block footer %}
-		&copy;2008-2018 <a href="http://nadineproject.org" target="_new">The Nadine Project</a>
+		&copy;2008-2019 <a href="http://nadineproject.org" target="_new">The Nadine Project</a>
 		by <a href="http://officenomads.com">Office Nomads</a>
 		{% endblock %}
 	</div>

diff --git a/tablet/templates/tablet/t_base.html b/tablet/templates/tablet/t_base.html
@@ -52,7 +52,7 @@ <h1>Nadine Member Console</h1>
 		{% if not tablet_ios %}
 			<div id="footer" data-role="footer" data-position="fixed">
 				<div style="float:right; margin-right: 1em;">Office Nomads</div>
-				<div style="float:left; margin-left: 1em;">&copy; 2007-2018 The Nadine Project</div>
+				<div style="float:left; margin-left: 1em;">&copy; 2007-2019 The Nadine Project</div>
 			</div>
 		{% endif %}
 	</div>