diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
| commit | 879493c35fd8d9e12e5cf3e56cd67ff07c3345c5 (patch) | |
| tree | 9615859e1d9a52f71da444b0b7359817bb6acc50 /railties/html | |
| parent | d6ecce66f4e125531875006eea8022b73fe135b5 (diff) | |
| parent | fc02eabf296d6edb74a95174c7322293a54c9492 (diff) | |
| download | rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.gz rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.bz2 rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'railties/html')
| -rw-r--r-- | railties/html/javascripts/controls.js | 2 | ||||
| -rw-r--r-- | railties/html/javascripts/dragdrop.js | 2 | ||||
| -rw-r--r-- | railties/html/javascripts/effects.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/html/javascripts/controls.js b/railties/html/javascripts/controls.js index fbc4418b83..5aaf0bb2b7 100644 --- a/railties/html/javascripts/controls.js +++ b/railties/html/javascripts/controls.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan) // (c) 2005-2007 Jon Tirsen (http://www.tirsen.com) // Contributors: diff --git a/railties/html/javascripts/dragdrop.js b/railties/html/javascripts/dragdrop.js index ccf4a1e45c..bf5cfea66c 100644 --- a/railties/html/javascripts/dragdrop.js +++ b/railties/html/javascripts/dragdrop.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) // // script.aculo.us is freely distributable under the terms of an MIT-style license. diff --git a/railties/html/javascripts/effects.js b/railties/html/javascripts/effects.js index 65aed23957..f030b5dbe9 100644 --- a/railties/html/javascripts/effects.js +++ b/railties/html/javascripts/effects.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // Contributors: // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) |