diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 21:42:27 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 21:42:27 +0100 |
commit | 660ce29ac2cf781c8e9607a837b9832e1692e156 (patch) | |
tree | dfc74f2056cfc9a1ce12eb17adf8bc3771510495 /setup.py | |
parent | 3daa945c334f719e7edb086021bfcc93880eb7f7 (diff) | |
parent | 57bbba43a75a72eeacd44f1ce5fcd6f203dc321c (diff) | |
download | Chimère-660ce29ac2cf781c8e9607a837b9832e1692e156.tar.bz2 Chimère-660ce29ac2cf781c8e9607a837b9832e1692e156.zip |
Merge branch 'master' into nef
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/settings.sample.py
chimere/static/chimere/js/jquery.chimere-ol.js
chimere/templates/chimere/base.html
chimere/templates/chimere/blocks/head_chimere.html
chimere/templates/chimere/blocks/map.html
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/tests.py
chimere/urls.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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, |