diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 03:51:39 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 03:51:39 +0100 |
| commit | cee23430ae5aca14d5dcd7cf2c52b62b392afcdf (patch) | |
| tree | 908dd90cdaf4edbd3251f17ff4539968a4dc0152 /chimere/templates/edit.html | |
| parent | 9fa2bf0f7516fb06fe6f05e5558f3ada6886d038 (diff) | |
| parent | 18f345f7759c25950cdf34b7bd677bf6e983d37f (diff) | |
| download | Chimère-cee23430ae5aca14d5dcd7cf2c52b62b392afcdf.tar.bz2 Chimère-cee23430ae5aca14d5dcd7cf2c52b62b392afcdf.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
chimere/static/styles.css
Diffstat (limited to 'chimere/templates/edit.html')
| -rw-r--r-- | chimere/templates/edit.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/templates/edit.html b/chimere/templates/edit.html index 4a02fe4..46982fd 100644 --- a/chimere/templates/edit.html +++ b/chimere/templates/edit.html @@ -1,7 +1,7 @@ {% extends "base_user.html" %} {% load i18n %} {% block extra_head %} -{% if dated %}<script type="text/javascript" src="{{extra_url}}admin/jsi18n"></script> +{% if dated %}<script type="text/javascript" src="{{extra_url}}jsi18n"></script> <script type="text/javascript" src="{{extra_url}}media/js/core.js"></script> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/base.css"/> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/widgets.css"/> |