include/nlohmann/detail/input/input_adapters.hpp · 85aaf91b855ec608c8a5a2c528e07878a22b11df · Libraries / json · GitLab

Find file Blame History Permalink

Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson · 2a638691
Julian Becker authored Oct 17, 2018
```
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	single_include/nlohmann/json.hpp
	src/unit-bson.cpp
```
2a638691

input_adapters.hpp 13.3 KB