diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-21 19:56:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-21 19:56:23 +0200 |
| commit | ea00d60a6e319905996c4f1afbbef2350f65e8e9 (patch) | |
| tree | 5c8167d2cffd62d1b6d107a00b673da5c4e0ca28 | |
| parent | 775ee06a42d55ad43c97a7b13c5652b855a4feb3 (diff) | |
| parent | 1feb9423c7c3d98a0cf0c691872e1bda4c145a89 (diff) | |
| download | Chimère-ea00d60a6e319905996c4f1afbbef2350f65e8e9.tar.bz2 Chimère-ea00d60a6e319905996c4f1afbbef2350f65e8e9.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | chimere/templates/chimere/blocks/footer.html | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chimere/templates/chimere/blocks/footer.html b/chimere/templates/chimere/blocks/footer.html index d895f88..a783939 100644 --- a/chimere/templates/chimere/blocks/footer.html +++ b/chimere/templates/chimere/blocks/footer.html @@ -1,3 +1,3 @@ {% load i18n %} -{% trans "This site uses Chimère"%} - <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> 2008-2013 <a href='http://blog.peacefrogs.net/nim/chimere/'>Chimère project</a> - {% trans "Map"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> <a href='http://openstreetmap.org/'>OpenStreetMap</a> +{% trans "This site uses Chimère"%} - <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> 2008-2013 <a href='http://www.chymeres.net/'>Chimère project</a> - {% trans "Map"%} <img src="{{STATIC_URL}}chimere/img/copyleft.png" alt="copyleft"/> <a href='http://openstreetmap.org/'>OpenStreetMap</a> @@ -21,7 +21,7 @@ setup( long_description=open('README.txt').read(), author=u'Étienne Loks', author_email='etienne.loks@peacefrogs.net', - url='http://blog.peacefrogs.net/nim/chimere/', + url='http://www.chymeres.net/', license='GPL v3 licence, see COPYING', packages=find_packages(), include_package_data=True, |