diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-12 00:17:26 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-12 00:17:26 -0300 |
| commit | 9201030320d09bb2ec76a7cc59aa58f77f984995 (patch) | |
| tree | 5f744c1828186fd769350796d348097f0645239b /Gemfile.lock | |
| parent | 66afa81110fb7162a27cb43ae30e9880498f2fe7 (diff) | |
| parent | a05a9f5e795714c91ec04a7bfa756556d662908d (diff) | |
| download | rails-9201030320d09bb2ec76a7cc59aa58f77f984995.tar.gz rails-9201030320d09bb2ec76a7cc59aa58f77f984995.tar.bz2 rails-9201030320d09bb2ec76a7cc59aa58f77f984995.zip | |
Merge pull request #24163 from prathamesh-sonpatki/fix-gemfile-lock
Fix Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8bc8bf4803..c76c4d7c2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -309,7 +309,7 @@ DEPENDENCIES rake (>= 10.3) redcarpet (~> 3.2.3) redis - resque + resque (< 1.26) resque-scheduler sass! sdoc (~> 0.4.0) |