허진호 / cloud_computing_fileshell

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

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 1 additions and 0 deletions
...@@ -24,6 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ...@@ -24,6 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
24 DEBUG = True 24 DEBUG = True
25 25
26 ALLOWED_HOSTS = [ 26 ALLOWED_HOSTS = [
27 + '13.125.219.232',
27 'localhost', 28 'localhost',
28 '.ap-northeast-2.compute.amazonaws.com', 29 '.ap-northeast-2.compute.amazonaws.com',
29 ] 30 ]
......