Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson

Browse source

Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp

...

This commit is contained in:

Julian Becker 2018-10-17 19:06:22 +02:00

parent 978c3c4116 4b2a00641c

commit 2a63869159

110 changed files with 2497 additions and 1418 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1345

single_include/nlohmann/json.hpp

View file

File diff suppressed because it is too large Load diff