summaryrefslogtreecommitdiff
path: root/json
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'af8abbb870562f38fa8f760f0462645277dc0e89'Julian Berman2022-08-171-1/+5
|\
* \ Merge commit '5d6a9931ff0d606b273c36a20bd0444a2a61ea24'Julian Berman2022-08-172-6/+37
|\ \ | |/
* | Merge commit '74e91ee79990c28d937d54a6d2f9d18fd338af20'Julian Berman2022-08-168-0/+113
|\ \ | |/
* | Merge commit '297cb8c4830ef4080d6ccf7ef7e0c0a4eb94342c'Julian Berman2022-08-0812-0/+600
|\ \ | |/
* | Merge commit '9e7387d89098b43062b9cbab177cd15aad965f6a'Julian Berman2022-08-064-14/+14
|\ \ | |/
* | Merge commit 'b9ff8c481f054bff83dad4c5b4da0efc221175f2'Julian Berman2022-08-0661-191/+198
|\ \ | |/
* | Merge commit '7a5fd08611cb2fb07b8200860a4e352eb33ae7bf'Julian Berman2022-08-0660-266/+242
|\ \ | |/
| * Squashed 'json/' changes from 2782d7c29..f82764080Julian Berman2022-08-06453-70522/+0
|/
* Squashed 'json/' changes from 685ac631d..2782d7c29Julian Berman2022-08-051-3/+3
* Merge commit 'ecc464314583f989ca4f3d9da87d60543b8b5189'Julian Berman2022-07-315-0/+912
|\
* \ Merge commit '999ff68a38729aaebe8b5b772b789b97dc145820'Julian Berman2022-07-257-0/+134
|\ \ | |/
* | Merge commit 'c09578b4249e70cc9148d012055b1071f2ad19a9'v4.7.0Julian Berman2022-07-1149-62/+852
|\ \ | |/
* | Merge commit '10104f7250d99f6c5225a5aa6ad0975fdbf7d555'Julian Berman2022-07-024-2/+67
|\ \ | |/
* | Merge commit 'cfff411af7d1e9b42b10ba36e5b8765f3eb1028b'Julian Berman2022-06-304-165/+41
|\ \ | |/
* | Merge commit '09edc31951f508ce164b9e74e3cd1a13d1d3a9f0'Julian Berman2022-06-307-27/+138
|\ \ | |/
* | Merge commit '118726fe2085ea58d9b3c1bd4764b389e8df8842'Julian Berman2022-06-284-1518/+0
|\ \ | |/
* | Merge commit '095a009acc1938caf9596085d5581e7196021f66'Julian Berman2022-06-2555-59/+2065
|\ \ | |/
* | Merge commit 'aeecae37b17b430c328d3c3e15bec90d30c8848b'Julian Berman2022-06-2112-75/+301
|\ \ | |/
* | Merge commit '4f9cd0eecf415da02a108d12bb3d4772d9837b65'Julian Berman2022-06-164-0/+1518
|\ \ | |/
* | Merge commit 'fdf82687138a183afe24b8d892c5ccf3db221b03'Julian Berman2022-06-162-0/+22
|\ \ | |/
* | Merge commit '7d135823a7c055e61b41e86294ef503cbf8da8a0'Julian Berman2022-05-187-1/+220
|\ \ | |/
* | Merge commit '19d2c1a183eeb2b2f4b07e05545b9e670babf986'Julian Berman2022-04-299-148/+114
|\ \ | |/
* | Merge commit 'aaf8e3125211f6fcda17b0a47e54a74c362202b7'Julian Berman2022-01-126-4/+227
|\ \ | |/
* | Merge commit '2f004cab9e731cc979b42fddfd1368818f73c4f6'Julian Berman2022-01-049-35/+31
|\ \ | |/
* | Merge commit 'c9b74362198d21cea59794c414f0877452ab9fa7'Julian Berman2021-11-037-0/+140
|\ \ | |/
* | Merge commit 'ddef3b4a06be6f66dc1384e31a408ee7658bac1a'Julian Berman2021-10-204-3/+52
|\ \ | |/
* | Merge commit '4ecbea58e0828696f7714abba624e2160518fddd'Julian Berman2021-10-1985-22/+680
|\ \ | |/
* | Merge commit 'cf886386cc0996df6743b425f74675a6d8a1a9ca'Julian Berman2021-10-07129-1289/+5355
|\ \ | |/
* | Merge commit 'b5e545b0e0a3a614562293fd7755cd8d2283e8d2'Julian Berman2021-08-2429-0/+225
|\ \ | |/
* | Merge commit '6cf6ff85b7cf595609a10267a85d354202e3b2f0'Julian Berman2021-08-2417-431/+679
|\ \ | |/
* | Merge commit '2591383efc85ba04e52e09aa73376f515baa4a49'Julian Berman2021-08-183-1/+76
|\ \ | |/
* | Merge commit '0fe6d845792049d67e25b452ca056689783358eb'Julian Berman2021-08-186-6/+6
|\ \ | |/
* | Merge commit 'f29c81f3d812a0d82428c90f3623dc5fb5331b2c'Julian Berman2021-08-063-0/+45
|\ \ | |/
* | Merge commit '528eb6f3d00e32a0c71a0bb10c1e443d102d5120' into draft2020-12Julian Berman2021-08-041-0/+15
|\ \ | |/
* | Merge commit '22e5c949401c3a0cd650a4fb28c6e91574a7ec47'Julian Berman2021-07-195-2/+434
|\ \ | |/
* | Merge commit '401a857bd7a71931e66e04eb086c4026f4c19846'Julian Berman2021-07-1319-866/+1668
|\ \ | |/
* | Merge commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02'Julian Berman2021-06-296-10/+90
|\ \ | |/
* | Merge commit '4e76fb6ae3c1f77d12bca82e4f92691dd57cac15'Julian Berman2021-06-266-2/+150
|\ \ | |/
* | Merge commit '6d455c83e3fd953a9e762e596c52ce1fc4bf8740'Julian Berman2021-06-24102-101/+12887
|\ \ | |/
* | Merge commit 'c19f0b4ee66ce10217185fa8d2c8b7a2784e3a31'Julian Berman2021-04-2825-30/+660
|\ \ | |/
* | Merge commit '61d6022ad9cceb91eb634d01eecfc15358b1d8a1'Julian Berman2021-04-12103-217/+11736
|\ \ | |/
* | Merge commit '037b4438fc54e52584cf8fb5e469cf3413751a1f' into mainJulian Berman2020-11-1712-1/+295
|\ \ | |/
* | Merge commit '918803aa556f4f87d6b952af316d47ecaf089164' into masterJulian Berman2020-10-0411-15/+171
|\ \ | |/
* | Merge commit '1a4ea00149e70383506f24648bfb52a2278fe3f7' into masterJulian Berman2020-09-0512-68/+72
|\ \ | |/
* | Merge commit 'b3ebd208e200797c1235c614c779f015addf1d99' into masterJulian Berman2020-08-148-1/+86
|\ \ | |/
* | Merge commit 'a57d8540bd272d913d57a37b45db3d9fe21a476b' into masterJulian Berman2020-08-1325-16/+486
|\ \ | |/
* | Merge pull request #709 from Djailla/py2Julian Berman2020-08-041-1/+0
|\ \
| * | [compat] Drop support of PY2Bastien Vallet2020-07-301-1/+0
* | | Merge commit '95874db4df84775af2429ddea7afd006523cef08'Julian Berman2020-07-2515-3/+700
|\ \ \ | |/ / |/| / | |/
* | Merge commit '774eda97acdba4c97eb338623024ce751449adbb'Julian Berman2020-07-022-0/+372
|\ \ | |/