8 commits

Author	SHA1	Message	Date
Niels Lohmann	b968faa882	🔖 set version to 3.3.0	2018-10-05 10:59:33 +02:00
Niels Lohmann	9f3857ef6f	🔖 set version to 3.2.0	2018-08-18 18:46:15 +02:00
Niels Lohmann	ed69e50ad2	📄 added SPDX-License-Identifier	2018-05-03 17:41:45 +02:00
Niels Lohmann	afef474c0d	🔖 set version to 3.1.2	2018-03-14 21:09:27 +01:00
Niels Lohmann	938c861a09	🔖 set version to 3.1.1	2018-02-12 22:59:36 +01:00
Niels Lohmann	0258484626	🔖 set version to 3.1.0 ... - updated documentation wrt. new repository layout - temporarily switched off Homebrew --HEAD building (can only be switched on after release) - set copyright date to 2018	2018-02-01 22:20:26 +01:00
Théo DELRIEU	14cd019861	fix cmake install directory (for real this time) ... * Rename 'develop' folder to 'include/nlohmann' * Rename 'src' folder to 'single_include/nlohmann' * Use <nlohmann/*> headers in sources and tests * Change amalgamate config file	2018-02-01 11:06:51 +01:00
Niels Lohmann	c6e7eae394	✨ implemented JSON Merge Patch (RFC 7396) ... SQLite's json1 extension (https://www.sqlite.org/json1.html) supports JSON Merge Patch (https://tools.ietf.org/html/rfc7396). As the implementation is trivial and we already support JSON Patch, I think this could be a nice extension to the library.	2017-12-13 23:36:22 +01:00