diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
| commit | 5df076ad0965dc684afff8a019fd9f92a53ada76 (patch) | |
| tree | b2272d3d7f0ed6713d888390a13b130c65aec6f3 /Gemfile | |
| parent | ac9443ed71bf0b40cf5b321e8e1b77b98abd9b5e (diff) | |
| parent | 9772de8d459960cc114c5b214343b7ce08fea21c (diff) | |
| download | rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.gz rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.bz2 rails-5df076ad0965dc684afff8a019fd9f92a53ada76.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -38,6 +38,9 @@ platforms :mri_19 do end platforms :ruby do + if ENV["RB_FSEVENT"] + gem 'rb-fsevent' + end gem 'json' gem 'yajl-ruby' gem "nokogiri", ">= 1.4.4" |