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

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
허진호
Commit 9439d21d3a307e05653843284025e8911c1d926c 9439d21d 1 parent 9973c3b4
Showing 1 changed file with 1 additions and 1 deletions
fileshell/settings.py
--- a/fileshell/settings.py
View file @9439d21
+++ b/fileshell/settings.py
View file @9439d21
@@ -140,4 +140,4 @@ SECRET_KEY = secret_key
 #AWS Access
 AWS_ACCESS_KEY_ID = key_id
 AWS_SECRET_ACCESS_KEY = secret_access_key
- AWS_STORAGE_BUCKET_NAME ='fileshell-test-jincy'
+ AWS_STORAGE_BUCKET_NAME ='fileshell-test'