Commit 0f294f13 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'feature-a/newer-json' into 'dev'

Update json.hpp

Closes #2615

See merge request !72
parents 1db9a920 717eea9e
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* @license LGPL * @license LGPL
json : Json library json : Json library
* @version ?? * @version 2.1.1
* @author Niels Lohmann * @author Niels Lohmann
* @link https://github.com/nlohmann/json * @link https://github.com/nlohmann/json
* @license MIT * @license MIT
......
This diff is collapsed.
This diff is collapsed.
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
!EXIT_CODE: 1 !EXIT_CODE: 1
$ Error, incorrect *.g $ Error, incorrect *.g
1:error.* cannot open .g file 1:error.* cannot properly read
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment