aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2016-09-01 07:07:57 +0300
committerPetri Lehtinen <petri@digip.org>2016-09-01 07:07:57 +0300
commit86196250b80fb13feb911a164af2ad980b078cc2 (patch)
tree5c4b5d3b706a0de5e0437ac79ab916c4cdcfae64
parent7d1af52ab46bd22c5f7b7e28a8d4dce2f0ef0420 (diff)
parentada5372cffa7707d82a81878558f47dfa1437a05 (diff)
downloadjansson-86196250b80fb13feb911a164af2ad980b078cc2.zip
jansson-86196250b80fb13feb911a164af2ad980b078cc2.tar.gz
jansson-86196250b80fb13feb911a164af2ad980b078cc2.tar.bz2
Merge branch '2.8'
-rw-r--r--CHANGES4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 5f81c5e..cb4ef03 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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).