Commit a770378f authored by Benjamin Sonntag's avatar Benjamin Sonntag
Browse files

merge of local changes

parent f60f3668
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -19,7 +19,7 @@ li { list-style: none; }
#auth { float: right; clear: both; }
#container { margin: 2em; }
#addForm.index { min-height: 300px; width: 40%; padding: 0; margin: 0 1em 0 1em; float: right; }
#addForm.index { min-height: 300px; width: 40%; padding: 0; margin: 0 0 0 1em; float: right; }
#addForm .fieldWrapper label { display: inline-block; min-width: 6em; }
#addForm.index .help_text { font-size: 0.7em; width: 30%; position: relative; float: right; left: 0; }
.index #add_attach { cursor: pointer; }
......
......@@ -12,6 +12,7 @@ ROOT_URL = ''
ADMINS = (
('stef', 'stef@ctrlc.hu'),
('nnmon', 'nnmon@laquadrature.net'),
)
MANAGERS = ADMINS
......@@ -38,7 +39,7 @@ TIME_ZONE = 'Europe/Brussels'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'
LANGUAGE_CODE = 'en'
SITE_ID = 1
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment