Niels Lohmann d1f84e81e9 Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen ... Conflicts: include/nlohmann/detail/input/input_adapters.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp		2021-11-13 14:31:42 +01:00
..
binary_writer.hpp	Fix spelling (#3125)	2021-11-09 14:46:58 +01:00
output_adapters.hpp	Allow allocators for output_vector_adapter (#2989)	2021-09-12 18:55:47 +02:00
serializer.hpp	🔥 consolidate documentation	2021-11-04 22:02:48 +01:00