Trevor Welsby 421affd06e Merge upstream commits and resolve conflicts

2016-01-25 02:01:01 +10:00

..

json_nlohmann_tests

ignore UTF-8 byte order mark (fixes #152)

2015-12-07 22:27:53 +01:00

json_roundtrip

more test cases

2015-05-09 16:58:06 +02:00

json_tests

added compliance test cases

2015-05-09 13:56:51 +02:00

json_testsuite

more tests

2015-06-30 00:12:18 +02:00

json.org

more tests

2015-06-30 00:12:18 +02:00

catch.hpp

upgraded Catch to v1.3.1

2015-12-20 15:42:01 +01:00

unit.cpp

Merge upstream commits and resolve conflicts

2016-01-25 02:01:01 +10:00