Vijay Dev 9d1bf059c0 Merge branch 'master' of github.com:rails/docrails ... Conflicts: guides/source/configuring.md		2016-04-29 16:00:15 +00:00
..
active_support	Merge branch 'master' of github.com:rails/docrails	2016-04-29 16:00:15 +00:00
active_support.rb	Add compatibility for Ruby 2.4 to_time changes	2016-04-23 15:03:50 +01:00