Merge pull request rails#17047 from betesh/master

rafaelfranca · rafaelfranca · commit a4c2e700334d · 2014-11-11T14:11:31.000-02:00
Time includes DateAndTime::Zones acts_like(:time)
Conflicts:
	activesupport/lib/active_support/core_ext/time/zones.rb
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb
@@ -1,4 +1,5 @@
 require 'active_support/time_with_zone'
+require 'active_support/core_ext/time/acts_like'
 
 class Time
   class << self

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require 'active_support/time_with_zone'`
	`2`	`+require 'active_support/core_ext/time/acts_like'`
`2`	`3`
`3`	`4`	`class Time`
`4`	`5`	`class << self`