Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Hu Wei
Json
Commits
fedf82c9
Unverified
Commit
fedf82c9
authored
4 years ago
by
Niels Lohmann
Browse files
Options
Download
Plain Diff
Merge branch 'develop' of
https://github.com/nlohmann/json
into feature/optional
parents
b61d563e
db78ac1d
feature/optional
No related merge requests found
Changes
333
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.circleci/config.yml
+28
-4
.circleci/config.yml
.clang-format
+84
-0
.clang-format
.clang-tidy
+12
-15
.clang-tidy
.github/CONTRIBUTING.md
+1
-1
.github/CONTRIBUTING.md
.github/ISSUE_TEMPLATE/Bug_report.md
+1
-1
.github/ISSUE_TEMPLATE/Bug_report.md
.github/ISSUE_TEMPLATE/Feature_request.md
+0
-17
.github/ISSUE_TEMPLATE/Feature_request.md
.github/ISSUE_TEMPLATE/config.yml
+5
-0
.github/ISSUE_TEMPLATE/config.yml
.github/ISSUE_TEMPLATE/question.md
+0
-34
.github/ISSUE_TEMPLATE/question.md
.github/workflows/codeql-analysis.yml
+54
-0
.github/workflows/codeql-analysis.yml
.github/workflows/macos.yml
+1
-1
.github/workflows/macos.yml
.github/workflows/ubuntu.yml
+1
-1
.github/workflows/ubuntu.yml
.github/workflows/windows.yml
+54
-3
.github/workflows/windows.yml
.gitignore
+8
-1
.gitignore
.travis.yml
+24
-16
.travis.yml
CMakeLists.txt
+30
-2
CMakeLists.txt
ChangeLog.md
+569
-98
ChangeLog.md
Makefile
+308
-282
Makefile
README.md
+195
-41
README.md
appveyor.yml
+22
-1
appveyor.yml
cmake/download_test_data.cmake
+17
-12
cmake/download_test_data.cmake
with
1414 additions
and
530 deletions
+1414
-530
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets