Merge branch 'develop' into feature/sax2

This commit is contained in:
Niels Lohmann 2018-05-06 13:29:23 +02:00
commit 5ff2abb90d
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
52 changed files with 582 additions and 418 deletions

View file

@ -5,6 +5,7 @@
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
SPDX-License-Identifier: MIT
Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
Permission is hereby granted, free of charge, to any person obtaining a copy