tree 1e6b2db81d39fa649712d7597d8e69018bba6c1c
parent cebb4e052a30f88af1181b585dca9ee4b1cca3b0
parent 0abf0f80c9fd07c89e5b4c4cb8f94db66c55148d
author Niels Lohmann <mail@nlohmann.me> 1553038696 +0100
committer Niels Lohmann <mail@nlohmann.me> 1553038696 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEeXFnrkHAptkjLkhFfzzqY64lG2kFAlyRfWwACgkQfzzqY64l
 G2lJ8g//bYlRkRDAszdS77qJxtwTfuMzagpxerRsV5q0mitivq+9G9DLCGVeuqNd
 trGM/0++b0k0Fk2EERrJYgB9IEhTqtXqupEZW+855YMvfZ2/F32Fs9oeMDUcotZJ
 K/IGHfb01axHQbtoNgxK5lftjm5NaVpEad38rQ+WcRJ5/XY7JeqD120P27iiuY1g
 Kf3QWj6z2LVunpKLh7hsI2428nOsOxK1t4wydPE3Er8ADPuFGKjMZfhXo3HVN/hk
 QESOVp5CW806L6JJ+KPgoRZV8GJzt3tGsRo8yc622THQs0+uLhP8lM4Ny++bdiFX
 lCnqi4oAo4em6Haas1Qptcz0hqyWexpNYmcGgepGI/dQCCuZIMwETD9Yl3WNjyT0
 XLPVImdLYb1sfX6WK14ESYMb7Zat9tEIttmtZ3Gep1x8AHSqKANG20G/dJx8Cp33
 7atzh7epKzcRMeGocRnuwhB1gyehzrFeNHwzn9vsiN+qv5SuEYVCZbW6SlUrKFzX
 dQLx+gBQ3jaVTmU05Kihxv7sMDX7k1Ic67zO/2ZvH/ubHSTZFCNcU6rFMprGst0G
 NsXWzs6yy5AXxcw2DDCBgFztTmCz9pyc2pRjiS1zwrnz2wuIc11zrY606tUtfzak
 kDFDuQRfuAPhGvPpKjBVMZo8QtoaAgTdmA2nKNZSmBi75IYtKq4=
 =Dfwh
 -----END PGP SIGNATURE-----

Merge branch 'release/3.6.0'