Merge branch '2.8'

2016-09-01 07:07:57 +03:00 · 2016-09-01 07:07:57 +03:00 · 86196250b8
commit 86196250b8
parent 7d1af52ab4 ada5372cff
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -7,7 +7,7 @@ Released 2016-08-30

  - Always preserve insertion order of object items.
    `json_object_iter()` and friends, `json_object_foreach()` and
-    json_dumps() and friends now always work in the insertion order of
+    `json_dumps()` and friends now always work in the insertion order of
    object items (#293).

  - Add `json_object_foreach_safe()` macro that allows
@ -80,7 +80,7 @@ Released 2016-08-30

  - Other minor fixes (#221, #248).

-* Ohter changes:
+* Other changes:

  - List all unrecognized object keys when strict unpacking fails
    (#263).