Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #5917 from oscardelben/master

Remove circular require warning
  • Loading branch information...
commit 90269802dbf690fbe8be0cd01e3b387a51f02b70 2 parents a719843 + f98d929
@drogus drogus authored
View
1  activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -1,5 +1,4 @@
require 'active_support/duration'
-require 'active_support/core_ext/time/zones'
require 'active_support/core_ext/time/conversions'
class Time
Please sign in to comment.
Something went wrong with that request. Please try again.