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 branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
3a39ab9
..
4878c0d
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-174,9
+174,7
@@
INSTALLED_APPS = (
# plugins
'plugins',
# views - more or less stable
# plugins
'plugins',
# views - more or less stable
- 'views',
- # temporary
- 'trash',
+ 'ui',
# managing database migrations
'south',
# Uncomment the next line to enable the admin:
# managing database migrations
'south',
# Uncomment the next line to enable the admin:
@@
-184,6
+182,8
@@
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',
+ # temporary - not packaged
+ 'trash',
'sample',
# DEPRECATED # 'django.contrib.formtools',
# DEPRECATED ## 'crispy_forms',
'sample',
# DEPRECATED # 'django.contrib.formtools',
# DEPRECATED ## 'crispy_forms',