Niels Lohmann d15ad85203 Merge branch 'develop' of https://github.com/nlohmann/json into string_view ... Conflicts: include/nlohmann/detail/meta/type_traits.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp		2021-08-30 17:34:31 +02:00
..
api	Merge branch 'develop' of https://github.com/nlohmann/json into string_view	2021-08-30 17:34:31 +02:00
features	Merge branch 'develop' of https://github.com/nlohmann/json into issue2863	2021-08-14 11:19:48 +02:00
home	Merge branch 'develop' of https://github.com/nlohmann/json into issue2824	2021-08-11 08:06:32 +02:00
integration	📝 add link to Homebrew package (#2966)	2021-08-22 21:58:37 +02:00
hooks.py	📝 add more documentation	2020-07-27 14:07:13 +02:00
index.md	📝 update documentation	2021-07-16 14:41:14 +02:00