From: Bryan <btbonval@gmail.com>
Date: Fri, 17 Jan 2014 00:39:32 +0000 (-0500)
Subject: synchronzing vmdev with prod because copypasta.
X-Git-Tag: release-20150131~238
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bd49711d4f1c38b7b849a6eb429a3d8b91f8bd19;p=oweals%2Fkarmaworld.git

synchronzing vmdev with prod because copypasta.
---

diff --git a/karmaworld/settings/vmdev.py b/karmaworld/settings/vmdev.py
index b02e1f6..ed7c169 100644
--- a/karmaworld/settings/vmdev.py
+++ b/karmaworld/settings/vmdev.py
@@ -11,12 +11,7 @@ from S3 import CallingFormat
 from common import *
 
 
-from karmaworld.secret.static_s3 import DEFAULT_FILE_STORAGE
-from karmaworld.secret.static_s3 import AWS_ACCESS_KEY_ID
-from karmaworld.secret.static_s3 import AWS_SECRET_ACCESS_KEY
-from karmaworld.secret.static_s3 import AWS_STORAGE_BUCKET_NAME
-from karmaworld.secret.static_s3 import S3_URL
-from karmaworld.secret.static_s3 import STATIC_URL
+from karmaworld.secret.static_s3 import *
 
 from karmaworld.secret.db_settings import PROD_DB_NAME
 from karmaworld.secret.db_settings import PROD_DB_USERNAME