github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into current_user_liquid_extensions

This commit is contained in:
Enrique García Cota 2012-03-03 00:05:59 +01:00
parent 7466f17141 188cb373e3
commit 5a4cc5508c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/assets.yml
View File

@ -2,9 +2,10 @@ embed_assets: off
# compress_assets: off
# package_assets: off
s3_bucket: <%= ENV['S3_BUCKET'] %>
s3_access_key_id: <%= ENV['S3_KEY_ID'] %>
s3_secret_access_key: <%= ENV['S3_SECRET_KEY'] %>
# If you're using S3 for asset storage, uncomment the following lines
# s3_bucket: <%= ENV['S3_BUCKET'] %>
# s3_access_key_id: <%= ENV['S3_KEY_ID'] %>
# s3_secret_access_key: <%= ENV['S3_SECRET_KEY'] %>
javascripts:
box: