diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-06 00:06:51 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2019-03-10 01:08:39 -0500 |
| commit | 8d898b737b8a8fdd472897d70087428d0cae5899 (patch) | |
| tree | 45e9685c26e8be1ca1fb70fc4112545fe4bf9f9d | |
| parent | 77230f277a3bb66762da74d03e7be3a06e858970 (diff) | |
Merge branch 'archweb-generic'
# Conflicts:
# public/tests.py
# templates/base.html
| -rw-r--r-- | templates/base.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/base.html b/templates/base.html index d1bf646b..228ad65a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -66,12 +66,12 @@ </div> {% endblock %} <div id="footer"> - <p>Copyleft 2009-{% now "Y" %} Parabola Project. All content is + <p>Copyright © 2009-{% now "Y" %} Parabola Project. All content is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">cc by-sa 3.0 unported</a> license.</p> <p>Website software and layout is derivative of archweb, - Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" + Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" title="Contact Aaron Griffin">Aaron Griffin</a>.</p> </div> |