3 Commits

Author	SHA1	Message	Date
Benoit Blanchon	e3e4aa89ad	Merge branch 'master' into 6.x ... # Conflicts: # CHANGELOG.md # src/ArduinoJson/Deserialization/JsonParser.hpp # src/ArduinoJson/Deserialization/JsonParserImpl.hpp # test/JsonBuffer/nestingLimit.cpp	2018-03-14 14:46:53 +01:00
Benoit Blanchon	b2a8085651	Added JsonError	2018-03-09 16:58:01 +01:00
Benoit Blanchon	7a2a64803a	Don't use JsonBuffer to create or parse objects and arrays. ... * Added DynamicJsonArray and StaticJsonArray * Added DynamicJsonObject and StaticJsonObject * Added DynamicJsonVariant and StaticJsonVariant * Added deserializeJson() * Removed JsonBuffer::parseArray(), parseObject() and parse() * Removed JsonBuffer::createArray() and createObject()	2018-02-26 16:05:16 +01:00