Merge branch 'develop' of https://github.com/metamaps/metamaps_gen002 into develop

This commit is contained in:
Devin Howard 2016-01-20 10:19:03 +08:00
commit cbd82b92fe

View file

@ -12,6 +12,7 @@ export DEVISE_SECRET_KEY='f71c467e526f23d614b3b08866cad4788c502bed869c282f06e73e
# # you can safely leave these blank, unless you're deploying an instance, in
# # which case you'll need to set them up
#
# export S3_BUCKET_NAME
# export AWS_ACCESS_KEY_ID
# export AWS_SECRET_ACCESS_KEY
# export SSO_KEY