Commit graph

7 commits

Author SHA1 Message Date
Niels Lohmann 6402077ac2
Merge pull request #876 from nlohmann/feature/rfc7396
JSON Merge Patch (RFC 7396)
2018-01-18 06:49:31 +01:00
Niels Lohmann 541b46132d
♻️ adjusted code to split headers 2018-01-14 10:34:43 +01:00
Théo DELRIEU 84bffd5d36
move amalgamate tool to third_party folder 2018-01-13 13:05:42 +01:00
Niels Lohmann a66b2d20c6
🚨 removed linter warnings for Python code 2018-01-13 11:15:23 +01:00
Niels Lohmann f4a55f26b0
added amalgamate Python script 2018-01-13 10:59:49 +01:00
Niels Lohmann 85173f5627
🔨 some clean up 2018-01-10 10:18:31 +01:00
Niels Lohmann 0a2920e0fd
♻️ reorganized code 2018-01-09 18:30:02 +01:00