Merge branch 's3_storage' of github.com:Gluejar/regluit into s3_storage

2013-02-11 11:28:13 -08:00 · 2013-02-11 11:28:13 -08:00 · 95bf4d8ba9
parent 4f46760ab9 e1318b5d1e
commit 95bf4d8ba9
1 changed files with 2 additions and 2 deletions
--- a/settings/just.py
+++ b/settings/just.py
@ -129,8 +129,8 @@ LOGGING = {
 }

 STATIC_ROOT = '/var/www/static'
-CKEDITOR_UPLOAD_PATH = '/var/www/static/media/'
-CKEDITOR_UPLOAD_PREFIX = 'https://just.unglue.it/static/media/'
+#CKEDITOR_UPLOAD_PATH = '/var/www/static/media/'
+#CKEDITOR_UPLOAD_PREFIX = 'https://just.unglue.it/static/media/'

 IS_PREVIEW = False