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 /activerecord | |
| 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 'activerecord')
| -rw-r--r-- | activerecord/MIT-LICENSE | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/MIT-LICENSE b/activerecord/MIT-LICENSE index e6df48772f..86bcb23b7c 100644 --- a/activerecord/MIT-LICENSE +++ b/activerecord/MIT-LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2009 David Heinemeier Hansson +Copyright (c) 2004-2010 David Heinemeier Hansson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 0c4cc6a554..9535c576be 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2004-2009 David Heinemeier Hansson +# Copyright (c) 2004-2010 David Heinemeier Hansson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the |