diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
| commit | 054fdbdf7a1e5106725b8b5a36db99242cfa65c1 (patch) | |
| tree | 1633b26e884feb1f29afedbb80cef7a6ecbdba2d /chimere/__init__.py | |
| parent | 8a5ba2650678ec22107a1a0a10650b6e0cc14683 (diff) | |
| parent | d02ec4246813eb0787bf3ab54af1af9ce32bd376 (diff) | |
| download | Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.tar.bz2 Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/static/chimere/js/jquery.chimere.js
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/utils.py
chimere/views.py
example_project/settings.py
Diffstat (limited to 'chimere/__init__.py')
| -rw-r--r-- | chimere/__init__.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chimere/__init__.py b/chimere/__init__.py index a7083c7..2ef2100 100644 --- a/chimere/__init__.py +++ b/chimere/__init__.py @@ -1,14 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> -from django.utils.translation import ugettext as _ - -# templates/chimere/edit.html, templates/chimere/edit_route.html -_(u"Multimedia files") -_(u"Picture files") - -VERSION = (2, 0) +VERSION = (2, 0, 2) def get_version(): return u'.'.join((unicode(num) for num in VERSION)) |