Commit 08dbd261 authored by moamoak's avatar moamoak
Browse files

Merge branch 'rm_stuff_settings' into 'master'

Fix #97 Update

Closes #97

See merge request federez/re2o!129
parents a4f66ca1 a99ee1a2
......@@ -165,11 +165,6 @@ STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static_files')
'cableur' : ['bureau','infra','bofh','tresorier'],
'bofh' : ['bureau','tresorier'],
'all_applications': True,
'group_models': True,
......@@ -73,7 +73,7 @@ from reversion import revisions as reversion
import ldapdb.models
import ldapdb.models.fields
from re2o.settings import RIGHTS_LINK, LDAP, GID_RANGES, UID_RANGES
from re2o.settings import LDAP, GID_RANGES, UID_RANGES
from re2o.login import hashNT
from re2o.field_permissions import FieldPermissionModelMixin
from re2o.mixins import AclMixin, RevMixin
Markdown is supported
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