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

pull/1/head
Raymond Yee 2013-02-11 11:28:13 -08:00
commit 95bf4d8ba9
1 changed files with 2 additions and 2 deletions

View File

@ -129,8 +129,8 @@ LOGGING = {
} }
STATIC_ROOT = '/var/www/static' STATIC_ROOT = '/var/www/static'
CKEDITOR_UPLOAD_PATH = '/var/www/static/media/' #CKEDITOR_UPLOAD_PATH = '/var/www/static/media/'
CKEDITOR_UPLOAD_PREFIX = 'https://just.unglue.it/static/media/' #CKEDITOR_UPLOAD_PREFIX = 'https://just.unglue.it/static/media/'
IS_PREVIEW = False IS_PREVIEW = False