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 /activemodel/lib/active_model/serialization.rb | |
| 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 'activemodel/lib/active_model/serialization.rb')
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 28f95f0cdc..1c48d4613a 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/except' require 'active_support/core_ext/hash/slice' module ActiveModel - # Provides a basic serialization to a serializable_hash for your object. # # A minimal implementation could be: |