Merge branch 'release-v3.1.0' into stable
Showing
... | ... | @@ -11,6 +11,7 @@ gem "liquid", "~> 2.3.0" |
gem "acts-as-taggable-on", "= 2.1.0" | ||
# Needed only on RUBY_VERSION = 1.8, ruby 1.9+ compatible interpreters should bring their csv | ||
gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18] | ||
gem "tzinfo", "~> 0.3.31" # Fixes #903. Not required for Rails >= 3.2 | ||
group :test do | ||
gem 'shoulda', '~> 2.10.3' | ||
... | ... | @@ -57,7 +58,7 @@ platforms :mri, :mingw do |
end | ||
group :postgres do | ||
gem "pg", "~> 0.9.0" | ||
gem "pg" | ||
# gem "postgres-pr" | ||
end | ||
end | ||
... | ... |
Please
register
or
sign in
to comment