diff options
author | adman65 <me@broadcastingadam.com> | 2012-03-05 23:33:41 +0200 |
---|---|---|
committer | adman65 <me@broadcastingadam.com> | 2012-03-05 23:33:41 +0200 |
commit | 7dfa8c084a250a1c9e3be6f8fad7689465096e35 (patch) | |
tree | 7ee066902ba28ae0591930330d6db5477d9c5f09 | |
parent | fd584a63deb8d2f1e8969d8527e7a9dbd9d68848 (diff) | |
parent | 3a0433b898a93d543abb261e1d3a307fcbf01ecd (diff) | |
download | rails-7dfa8c084a250a1c9e3be6f8fad7689465096e35.tar.gz rails-7dfa8c084a250a1c9e3be6f8fad7689465096e35.tar.bz2 rails-7dfa8c084a250a1c9e3be6f8fad7689465096e35.zip |
Merge branch 'master' of github.com:lifo/docrails
-rw-r--r-- | railties/guides/source/asset_pipeline.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile index a061c1fc16..b1b1d21c2d 100644 --- a/railties/guides/source/asset_pipeline.textile +++ b/railties/guides/source/asset_pipeline.textile @@ -128,7 +128,7 @@ For example, these files: <plain> app/assets/javascripts/home.js lib/assets/javascripts/moovinator.js -vendor/assets/javascript/slider.js +vendor/assets/javascripts/slider.js </plain> would be referenced in a manifest like this: |