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 /activeresource | |
| 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 'activeresource')
| -rw-r--r-- | activeresource/MIT-LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/MIT-LICENSE b/activeresource/MIT-LICENSE index 5eb8c94758..1bf965ff1e 100644 --- a/activeresource/MIT-LICENSE +++ b/activeresource/MIT-LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2006-2009 David Heinemeier Hansson +Copyright (c) 2006-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 |