diff options
| author | root <root@viserion.(none)> | 2013-04-16 18:25:46 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-04-16 18:25:46 +0000 |
| commit | 98999b793a2fa014f88c18befe0fc94e40141c16 (patch) | |
| tree | 515107ae533dc2cd59cd018c92843ac3ae2a3fe2 | |
| parent | 868f86846e38348eea76578b4c9803d3dbda6bfe (diff) | |
| parent | d71927ba803b37318b1a8e88183db41810bf2b25 (diff) | |
| download | Ishtar-98999b793a2fa014f88c18befe0fc94e40141c16.tar.bz2 Ishtar-98999b793a2fa014f88c18befe0fc94e40141c16.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 |