허진호 / cloud_computing_fileshell

Go to a project
Toggle navigation Toggle navigation pinning
허진호
a671f362 1 parent 3e1a6103

Merge branch 'dev' of https://github.com/jh8579/fileshell_cloudcomputing into dev 

# Conflicts:
#	fileshell/models.py
#	fileshell/settings.py
#	fileshell/urls.py
#	fileshell/views.py
#	templates/base.html
Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
...@@ -23,7 +23,10 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ...@@ -23,7 +23,10 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
23 # SECURITY WARNING: don't run with debug turned on in production! 23 # SECURITY WARNING: don't run with debug turned on in production!
24 DEBUG = True 24 DEBUG = True
25 25
26 -ALLOWED_HOSTS = [] 26 +ALLOWED_HOSTS = [
27 + 'localhost',
28 + '.ap-northeast-2.compute.amazonaws.com',
29 +]
27 30
28 31
29 # Application definition 32 # Application definition
......