허진호 / cloud_computing_fileshell

Go to a project
Toggle navigation Toggle navigation pinning
허진호
9439d21d 1 parent 9973c3b4

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 1 deletions
...@@ -140,4 +140,4 @@ SECRET_KEY = secret_key ...@@ -140,4 +140,4 @@ SECRET_KEY = secret_key
140 #AWS Access 140 #AWS Access
141 AWS_ACCESS_KEY_ID = key_id 141 AWS_ACCESS_KEY_ID = key_id
142 AWS_SECRET_ACCESS_KEY = secret_access_key 142 AWS_SECRET_ACCESS_KEY = secret_access_key
143 -AWS_STORAGE_BUCKET_NAME ='fileshell-test-jincy' 143 +AWS_STORAGE_BUCKET_NAME ='fileshell-test'
......