diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-17 12:53:15 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-17 12:53:15 -0700 |
| commit | 8f15565de879bd40c8390884d1d31e52de240323 (patch) | |
| tree | c6c30c4a07a5d11f46d50853613b909ee0e8c6ae /Gemfile | |
| parent | 9f6e82ee4783e491c20f5244a613fdeb4024beb5 (diff) | |
| parent | e158ee50e64e2ae2460cd26be53039922f588300 (diff) | |
| download | rails-8f15565de879bd40c8390884d1d31e52de240323.tar.gz rails-8f15565de879bd40c8390884d1d31e52de240323.tar.bz2 rails-8f15565de879bd40c8390884d1d31e52de240323.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
@@ -7,7 +7,7 @@ gemspec # ensure correct loading order gem 'mocha', '~> 0.14', require: false -gem 'rack', github: 'rack/rack' +gem 'rack', github: 'rack/rack', branch: 'master' gem 'rack-cache', '~> 1.2' gem 'jquery-rails', '~> 3.1.0' gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' |