Niels Lohmann dc06f100be Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows ... Conflicts: include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/json_sax.hpp include/nlohmann/detail/input/lexer.hpp include/nlohmann/detail/input/parser.hpp include/nlohmann/detail/json_pointer.hpp include/nlohmann/detail/output/serializer.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp		2020-07-11 14:04:40 +02:00
..
codeql-analysis.yml	👷 add code scanning	2020-07-08 12:25:53 +02:00
macos.yml	🔧 explicitly switch on tests in CI	2020-05-27 13:22:14 +02:00
ubuntu.yml	🔧 explicitly switch on tests in CI	2020-05-27 13:22:14 +02:00
windows.yml	🔧 explicitly switch on tests in CI	2020-05-27 13:22:14 +02:00
windows_clang.yml	👷 remove Clang 8	2020-06-04 12:48:03 +02:00