Niels Lohmann 5e9bf559b1 # Conflicts: ...

#	.github/workflows/macos.yml
#	include/nlohmann/detail/input/parser.hpp
#	include/nlohmann/detail/meta/std_fs.hpp
#	include/nlohmann/json.hpp
#	single_include/nlohmann/json.hpp

2024-11-16 23:23:05 +01:00

..

external_ci

Fix CI issues (#3906)

2023-01-31 19:23:37 +01:00

ISSUE_TEMPLATE

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

workflows

# Conflicts:

2024-11-16 23:23:05 +01:00

CODE_OF_CONDUCT.md

Reorganize directories (#3462)

2022-05-01 09:41:50 +02:00

CODEOWNERS

Update CODEOWNERS (#4126)

2023-08-28 22:04:08 +02:00

config.yml

…

CONTRIBUTING.md

🔀 merge develop

2024-11-08 22:40:55 +01:00

FUNDING.yml

…

labeler.yml

Add labeler action (#3671)

2022-08-04 16:46:45 +02:00

PULL_REQUEST_TEMPLATE.md

Fix typos in .md files (#3748)

2022-09-17 10:34:30 +02:00

SECURITY.md

…

stale.yml

…