diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-10 15:34:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-10 15:34:55 -0300 |
| commit | 085ce4f1411238a6109fb9c22fdb2c46b27c2c0e (patch) | |
| tree | e57262b3e867ee6fef40e63e09619fffde075d8e /rails.gemspec | |
| parent | 54d8c81fefdb566c2f317afd0142cade0273bdbc (diff) | |
| parent | 53610e5140149aca3a15a27ef103350a5969f7aa (diff) | |
| download | rails-085ce4f1411238a6109fb9c22fdb2c46b27c2c0e.tar.gz rails-085ce4f1411238a6109fb9c22fdb2c46b27c2c0e.tar.bz2 rails-085ce4f1411238a6109fb9c22fdb2c46b27c2c0e.zip | |
Merge branch 'master' into rm-uuid-fixtures
Conflicts:
activerecord/CHANGELOG.md
activesupport/CHANGELOG.md
Diffstat (limited to 'rails.gemspec')
| -rw-r--r-- | rails.gemspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rails.gemspec b/rails.gemspec index d1c199a97a..4800df0df4 100644 --- a/rails.gemspec +++ b/rails.gemspec @@ -27,5 +27,5 @@ Gem::Specification.new do |s| s.add_dependency 'railties', version s.add_dependency 'bundler', '>= 1.3.0', '< 2.0' - s.add_dependency 'sprockets-rails', '~> 2.0.0' + s.add_dependency 'sprockets-rails', '~> 2.1' end |