diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2015-11-04 17:22:48 -0600 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2015-11-04 17:22:48 -0600 |
commit | cb4ef80f20a23e9c42876b039d8af7d02fd416fb (patch) | |
tree | 5e8c2eaf367a9ee395f1213624ad42a08cbf4f06 /gemfiles | |
parent | ee06b33e19019e771f0305a40b15885c22499a8b (diff) | |
parent | 7c1631fa48b8862f37d1026b4f0cf1061dd6947a (diff) | |
download | rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.tar.gz rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.tar.bz2 rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.zip |
Merge branch 'master' into subscription-rejection
Diffstat (limited to 'gemfiles')
-rw-r--r-- | gemfiles/Gemfile.rails-4-2 (renamed from gemfiles/rails_42.gemfile) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/gemfiles/rails_42.gemfile b/gemfiles/Gemfile.rails-4-2 index 8ca60d69db..8ca60d69db 100644 --- a/gemfiles/rails_42.gemfile +++ b/gemfiles/Gemfile.rails-4-2 |