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

..

DynamicJsonBuffer

Added JsonError

2018-03-09 16:58:01 +01:00

IntegrationTests

Added JsonError

2018-03-09 16:58:01 +01:00

JsonArray

Added JsonError

2018-03-09 16:58:01 +01:00

JsonObject

Replaced printTo() with serializeJson()

2018-03-01 09:24:58 +01:00

JsonParser

Merge branch 'master' into 6.x

2018-03-14 14:46:53 +01:00

JsonSerializer

Replaced printTo() with serializeJson()

2018-03-01 09:24:58 +01:00

JsonVariant

Replaced printTo() with serializeJson()

2018-03-01 09:24:58 +01:00

JsonWriter

Set copyright year to 2018

2018-01-05 09:20:01 +01:00

Misc

Added JsonError

2018-03-09 16:58:01 +01:00

Polyfills

Kept only two namespaces ArduinoJson and ArduinoJson::Internals

2018-01-19 08:32:15 +01:00

StaticJsonBuffer

Don't use JsonBuffer to create or parse objects and arrays.

2018-02-26 16:05:16 +01:00

CMakeLists.txt

Replaced printTo() with serializeJson()

2018-03-01 09:24:58 +01:00