diff options
author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 14:04:23 +1100 |
---|---|---|
committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 14:04:23 +1100 |
commit | 12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a (patch) | |
tree | a7a7b097f59eaddc8cb209a1e83505843eab99fa /Gemfile | |
parent | 535ae3b946b387af7eb6cb4bb4aed3d5cac1cf81 (diff) | |
parent | df8852d04d030330efcb86f16977b837473bf022 (diff) | |
download | rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.tar.gz rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.tar.bz2 rails-12681c2a71f6272aaa8e1fa7cc6b5df588c96b1a.zip |
Merge branch 'master' of git://github.com/rails/rails
Conflicts:
activemodel/README
activemodel/lib/active_model/errors.rb
activemodel/lib/active_model/serialization.rb
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -11,7 +11,6 @@ if RUBY_VERSION < '1.9' end # AR -gem "arel", ">= 0.2.0" gem "sqlite3-ruby", ">= 1.2.5" group :test do |