diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-22 10:38:46 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-22 10:38:46 +0200 | 
| commit | 42ac5a4f41e5ae471ba96b2c0ad0f8965501446b (patch) | |
| tree | 865ad1cf5d315558406c64bc797ddb844e3422c5 /example_project/settings.py | |
| parent | 64000a8c56da1872901f89faeb00df60f4994dd1 (diff) | |
| parent | fd445130a3f7566d00c00b92de92eb034445b79e (diff) | |
| download | Ishtar-42ac5a4f41e5ae471ba96b2c0ad0f8965501446b.tar.bz2 Ishtar-42ac5a4f41e5ae471ba96b2c0ad0f8965501446b.zip  | |
Merge branch 'master' into v0.9
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 6 | 
1 files changed, 0 insertions, 6 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index 9d3a9b46b..128befe5a 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -30,9 +30,6 @@ BASE_URL = "/"  URL_PATH = ""  EXTRA_VERSION = '' -# prefix for archaeological files code -FILE_PREFIX = "SRA" -  ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt"  LOGIN_REDIRECT_URL = "/" + URL_PATH @@ -218,12 +215,9 @@ ISHTAR_PERIODS = {}  ISHTAR_PERMIT_TYPES = {}  ISHTAR_DOC_TYPES = {u"undefined": u"Undefined"} -ISHTAR_LOCAL_PREFIX = "SRA" -  ISHTAR_DPTS = []  OP_PREFIX = 'OP' -FILE_PREFIX = 'SRA'  PRE_APPS = []  EXTRA_APPS = []  | 
