tree 1e6b2db81d39fa649712d7597d8e69018bba6c1c
parent 002addabd8be311dbed48cbdb3fb6e80383a4287
parent 0abf0f80c9fd07c89e5b4c4cb8f94db66c55148d
author Niels Lohmann <mail@nlohmann.me> 1553038709 +0100
committer Niels Lohmann <mail@nlohmann.me> 1553038709 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEeXFnrkHAptkjLkhFfzzqY64lG2kFAlyRfXgACgkQfzzqY64l
 G2kUAQ/8CT1aH/uV0ZAwpcHbKK5pVwu2CArr9PIIgiNawXxsEwwgwdQiR/Uyb2MN
 ehXoON6bg5dxv/XQ8cabOomxfEr3DvCWj+njWNUh4HQ36n+pPQz0VQzbD6eB3oPb
 PwmAYbmP1ciFbEeZAVf5U1DlyAK5k4HojOMLMVOHP2phS2GmUvbQEcSJvgNeQP3J
 y48IY4fdlZHAYNCSesuS8hd4pGAkKovLjl9BhuVbv2ojs8DKHb/DU2PSG+5v1VjC
 NWt9bSZC3MOXbVvjOng6JqLSP+ezY1J4+siXES9/f8kH3Wac9K1bDT9LM4vQ1MAR
 j0VcVMRo199Tclj/XQfqKzQEn4F8nsZp/B1odbkQxTzbAIw+h9rCgXh2wiGZZLnM
 gDLWzC/A7/Ghr+4/WYoCNheTr+FhNKbMLfvUxJpaS98N/oQW3iYgmrHBeQzg9El2
 WDGSWuYUO1Vg1WxfTn9EvmXDp7IXVvnXGYT7Cg7x4q4Pjl0BbSvBIUMbC6XbNB44
 eybsDWOS0me2qk5gbQdPcfnCwB+OaNoRvXnaywBvk2nxhg6fSejxqIbIRey8sEDl
 WVTRQXx9RKoW+4mRKUsx0VQ+rBekwvFW9uxrF3NshCN9vx7NmAJBzPHLVp+hV4pf
 jD6t9nFpbxB7jFq2QN1N62aKgSubmjEd7mj3uz5t2MlCNNXnkyA=
 =w3ln
 -----END PGP SIGNATURE-----

Merge branch 'release/3.6.0' into develop