diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-04-16 18:25:46 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-04-16 18:25:46 +0000 |
| commit | 11c304b7454a8c1ef771a5233182af06e0079f6f (patch) | |
| tree | 515107ae533dc2cd59cd018c92843ac3ae2a3fe2 | |
| parent | 8b5c844698a1370813b41c52a098131b697dfdd6 (diff) | |
| parent | e9d334d8b1ec12702275abf2383e7aae01dfba6d (diff) | |
| download | Ishtar-11c304b7454a8c1ef771a5233182af06e0079f6f.tar.bz2 Ishtar-11c304b7454a8c1ef771a5233182af06e0079f6f.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
| -rw-r--r-- | example_project/settings.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index af71e2896..a9888375f 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -13,8 +13,7 @@ JQUERY_URL = "http://localhost/javascript/jquery/jquery.js" JQUERY_UI_URL = "http://localhost/javascript/jquery-ui/" XHTML2ODT_PATH = ROOT_PATH + "../xhtml2odt" -ODT_TEMPLATE = os.sep.join([ROOT_PATH[:-1], "..", "ishtar_common", - "static", "template.odt"]) +ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt" LOGIN_REDIRECT_URL = "/" + URL_PATH DEBUG = 1 |