diff options
| author | Marcos Tapajos <tapajos@gmail.com> | 2008-06-02 09:47:53 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-06-02 09:47:53 -0500 |
| commit | 14a65cd982161364028da312f415c1ebe0bcd5ac (patch) | |
| tree | 1a0eee9b4a8796627cf052ad815a6b7a0fe504db /activesupport/CHANGELOG | |
| parent | 4210d85a3f3ce4e980f473e9ed2becb84b58363b (diff) | |
| download | rails-14a65cd982161364028da312f415c1ebe0bcd5ac.tar.gz rails-14a65cd982161364028da312f415c1ebe0bcd5ac.tar.bz2 rails-14a65cd982161364028da312f415c1ebe0bcd5ac.zip | |
Fixed changelog merge.
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 690bb987dc..15c25debf4 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -166,7 +166,6 @@ * Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. [Geoff Buesing] ->>>>>>> .r8815 * Replace non-dst-aware TimeZone class with dst-aware class from tzinfo_timezone plugin. TimeZone#adjust and #unadjust are no longer available; tzinfo gem must now be present in order to perform time zone calculations, via #local_to_utc and #utc_to_local methods. [Geoff Buesing] * Extract ActiveSupport::Callbacks from Active Record, test case setup and teardown, and ActionController::Dispatcher. #10727 [Josh Peek] |