json/.github
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
..
ISSUE_TEMPLATE 🔧 remove feature request template 2020-06-27 12:55:41 +02:00
workflows Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 2020-07-11 14:04:40 +02:00
CODEOWNERS Some typos 2020-02-02 17:29:37 +08:00
config.yml 🚀 installed Request Info Bot 2017-10-30 16:04:34 +01:00
CONTRIBUTING.md Update documentation to reflect addition of Arch Linux CI testing. 2020-05-25 20:46:39 -04:00
FUNDING.yml 👥 add GitHub Sponsors 2019-11-22 20:58:44 +01:00
PULL_REQUEST_TEMPLATE.md Some typos 2020-02-02 17:29:37 +08:00
SECURITY.md 🔒 add security policy 2019-07-28 21:46:32 +02:00
stale.yml 🚀 installed Stale Bot 2017-10-25 11:37:33 +02:00