diff options
author | Joshua Peek <josh@joshpeek.com> | 2011-04-12 22:35:24 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2011-04-12 22:35:24 -0500 |
commit | f004c8868196f62a6810bc7e693b407fd27a5fa7 (patch) | |
tree | 53b05e2adf195880080e4758254dcccf49219611 /railties/lib/rails/tasks.rb | |
parent | 1b5b53da5e4beb24dc7d41a1e9e5d72b82586985 (diff) | |
parent | a4518517f77055cea0d9fe552d2df393140679de (diff) | |
download | rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.tar.gz rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.tar.bz2 rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.zip |
Merge branch 'sprockets'
Diffstat (limited to 'railties/lib/rails/tasks.rb')
-rw-r--r-- | railties/lib/rails/tasks.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb index af52014728..4d09b0c2c0 100644 --- a/railties/lib/rails/tasks.rb +++ b/railties/lib/rails/tasks.rb @@ -3,6 +3,7 @@ $VERBOSE = nil # Load Rails rakefile extensions %w( annotations + assets documentation framework log |