fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into lqc-trunk
[redakcja.git]
/
platforma
/
settings.py
diff --git
a/platforma/settings.py
b/platforma/settings.py
index
3a1f3ad
..
87868ce
100644
(file)
--- a/
platforma/settings.py
+++ b/
platforma/settings.py
@@
-121,7
+121,6
@@
INSTALLED_APPS = (
'explorer',
'toolbar',
'api',
'explorer',
'toolbar',
'api',
- 'wysiwyg',
)
)