Skip to content

Commit 69d7448

Browse files
nlohmannnlohmann
committed
Merge branch 'release/3.11.1'
2 parents cbaf103 + f2020da commit 69d7448

File tree

149 files changed

+384
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+384
-371
lines changed

‎.github/ISSUE_TEMPLATE/bug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ body:
7676
label: Library version
7777
description: >
7878
Which version of the library did you use? If it is a released version,
79-
please enter the version number (e.g., 3.11.0). Otherwise, please enter
79+
please enter the version number (e.g., 3.11.1). Otherwise, please enter
8080
the commit hash. If you got the library from another source as the
8181
GitHub repository (e.g., via a package manager), please also state
8282
this.

‎.reuse/templates/json.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__ _____ _____ _____
22
__| | __| | | | JSON for Modern C++
3-
| | |__ | | | | | | version 3.11.0
3+
| | |__ | | | | | | version 3.11.1
44
|_____|_____|_____|_|___| https://github.com/nlohmann/json
55

66
{% for copyright_line in copyright_lines %}

‎.reuse/templates/json_support.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__ _____ _____ _____
22
__| | __| | | | JSON for Modern C++ (supporting code)
3-
| | |__ | | | | | | version 3.11.0
3+
| | |__ | | | | | | version 3.11.1
44
|_____|_____|_____|_|___| https://github.com/nlohmann/json
55

66
{% for copyright_line in copyright_lines %}

‎CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors:
77
email: [email protected]
88
website: https://nlohmann.me
99
title: "JSON for Modern C++"
10-
version: 3.11.0
10+
version: 3.11.1
1111
date-released: 2022-01-03
1212
license: MIT
1313
repository-code: "https://github.com/nlohmann"

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
44
## PROJECT
55
## name and version
66
##
7-
project(nlohmann_json VERSION 3.11.0 LANGUAGES CXX)
7+
project(nlohmann_json VERSION 3.11.1 LANGUAGES CXX)
88

99
##
1010
## MAIN_PROJECT CHECK

‎ChangeLog.md

Lines changed: 182 additions & 169 deletions

‎README.md

Lines changed: 1 addition & 1 deletion

‎docs/docset/docset.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "JSON for Modern C++",
3-
"version": "3.11.0",
3+
"version": "3.11.1",
44
"archive": "JSON_for_Modern_C++.tgz",
55
"author": {
66
"name": "Niels Lohmann",

‎docs/examples/meta.output

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": {
1212
"major": 3,
1313
"minor": 11,
14-
"patch": 0,
15-
"string": "3.11.0"
14+
"patch": 1,
15+
"string": "3.11.1"
1616
}
1717
}

‎docs/examples/nlohmann_json_version.output

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
JSON for Modern C++ version 3.11.0
1+
JSON for Modern C++ version 3.11.1

0 commit comments

Comments
 (0)