summaryrefslogtreecommitdiff
path: root/lib/json/add/date_time.rb
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-06-07 18:02:09 +0200
committerFlorian Frank <flori@ping.de>2016-06-07 18:02:09 +0200
commite21126d495fd2d6d269bd65f4f0856a6ab6108fc (patch)
treedc169fea3e6b00a1dd594b19a24e69c250358204 /lib/json/add/date_time.rb
parent00ce49d92bfce23a93bb52bc1ab9e9bf040a4493 (diff)
parent6327cbb815226cbdfe24b7ed41e015c6c1f2ac20 (diff)
downloadjson-e21126d495fd2d6d269bd65f4f0856a6ab6108fc.tar.gz
Merge branch 'master' into nobu-trunk
Diffstat (limited to 'lib/json/add/date_time.rb')
-rw-r--r--lib/json/add/date_time.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/json/add/date_time.rb b/lib/json/add/date_time.rb
index 0edeeda..38b0e86 100644
--- a/lib/json/add/date_time.rb
+++ b/lib/json/add/date_time.rb
@@ -4,7 +4,6 @@ unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
end
require 'date'
-# DateTime serialization/deserialization
class DateTime
# Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,