git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/onelab' into onelab
[myslice.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
bcd8df5
..
5fe2169
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-34,6
+34,7
@@
except:
# DEBUG
if config.myslice.debug :
DEBUG = True
# DEBUG
if config.myslice.debug :
DEBUG = True
+ INTERNAL_IPS = ("127.0.0.1","132.227.84.195","132.227.78.191","132.227.84.191")
else :
DEBUG = False
else :
DEBUG = False
@@
-256,8
+257,7
@@
INSTALLED_APPS = [
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'portal',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'portal',
- #SLA
- #'sla',
+ #'debug_toolbar',
]
# with django-1.7 we leave south and use native migrations
# managing database migrations
]
# with django-1.7 we leave south and use native migrations
# managing database migrations