summaryrefslogtreecommitdiff
path: root/json/bin
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '7a5fd08611cb2fb07b8200860a4e352eb33ae7bf'Julian Berman2022-08-061-35/+101
|\
| * Squashed 'json/' changes from 2782d7c29..f82764080Julian Berman2022-08-061-268/+0
|/
* Merge commit 'c09578b4249e70cc9148d012055b1071f2ad19a9'v4.7.0Julian Berman2022-07-111-62/+73
|\
* \ Merge commit '09edc31951f508ce164b9e74e3cd1a13d1d3a9f0'Julian Berman2022-06-301-5/+17
|\ \ | |/
* | Merge commit '7d135823a7c055e61b41e86294ef503cbf8da8a0'Julian Berman2022-05-181-1/+4
|\ \ | |/
* | Merge commit 'aaf8e3125211f6fcda17b0a47e54a74c362202b7'Julian Berman2022-01-121-4/+12
|\ \ | |/
* | Merge commit '61d6022ad9cceb91eb634d01eecfc15358b1d8a1'Julian Berman2021-04-121-93/+25
|\ \ | |/
* | Merge commit 'a57d8540bd272d913d57a37b45db3d9fe21a476b' into masterJulian Berman2020-08-131-1/+3
|\ \ | |/
* | [compat] Drop support of PY2Bastien Vallet2020-07-301-1/+0
* | Merge commit '11df97257859996434f37e33ad3d8cf2bd3606da'Julian Berman2020-03-041-0/+6
|\ \ | |/
* | Merge commit 'f7930d774c893cfae814a214d9b2ba0c01957928'Julian Berman2020-02-221-7/+4
|\ \ | |/
* | Merge commit '05fe96aa3669635a6f01359bf80a312002b4d7cd'Julian Berman2019-10-021-5/+8
|\ \ | |/
* | Merge commit 'a5a5a45cfa7ac901462ca8afcab544f3c2de9e1d'Julian Berman2019-09-221-2/+2
|\ \ | |/
* | Merge commit '2024cbfe74024a1ded9daa679b218fe3255b6635'Julian Berman2019-07-261-4/+38
|\ \ | |/
* | Merge commit 'cf09b910f1fc8b8b1c7938310e6c1aabc379bbdd'Julian Berman2019-06-171-1/+1
|\ \ | |/
* | Merge commit '38e7f0b784a64de4cee9e53dd118fd558fb3bf6e'Julian Berman2018-11-181-16/+3
|\ \ | |/
* | Merge commit '8bff7e3c726f3adcb9f16a54fa5f510028c4c151'Julian Berman2017-06-101-37/+28
|\ \ | |/
| * Squashed 'json/' changes from ddef9b0..abdd47fJulian Berman2014-06-011-283/+0
|/
* Merge commit '0a93c5da6f8db71ded773af1d5609c5f2e6ba241'Julian Berman2013-06-171-2/+6
* Update test suite.Julian Berman2013-02-221-10/+12
* Merge commit '9fbaf7ea41abaeed40742ab1f8b3519c3e5954bb' as 'json'Julian Berman2013-02-221-0/+277
* Switching to actual subtree.Julian Berman2013-02-221-172/+0
* Update the test suite.Julian Berman2013-02-151-14/+61
* Update suiteJulian Berman2012-12-271-0/+9
* OK, let's see if this worked. Updated test suite.Julian Berman2012-12-241-0/+116