diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-07 16:10:20 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-07 16:10:20 -0700 |
| commit | 089661b69ad055cab68ea860c085c7f852da3972 (patch) | |
| tree | a39fe35f3c399b199bdca8490724b451761a1cba /Gemfile | |
| parent | cc1de71bfaced172fe00a66fd381da69d9528e8b (diff) | |
| parent | e81453ef92b37156dafc092093106c8e8b87b268 (diff) | |
| download | rails-089661b69ad055cab68ea860c085c7f852da3972.tar.gz rails-089661b69ad055cab68ea860c085c7f852da3972.tar.bz2 rails-089661b69ad055cab68ea860c085c7f852da3972.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,7 +10,7 @@ gem 'mocha', '~> 0.14', require: false gem 'rack', github: 'rack/rack' gem 'rack-cache', '~> 1.2' gem 'jquery-rails', '~> 3.1.0' -gem 'turbolinks' +gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' gem 'coffee-rails', '~> 4.0.0' gem 'arel', github: 'rails/arel', branch: 'master' gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master' |