tree 8b64f8292eee84dcb03207004e249cf829602ec7
parent 314e4e7699087b96c6fbdc4d8d3458ef11a2a16c
parent 106f9f5436f6726006627ce3122fddf7fc9ca330
author Niels Lohmann <mail@nlohmann.me> 1513505093 +0100
committer Niels Lohmann <mail@nlohmann.me> 1513505093 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEeXFnrkHAptkjLkhFfzzqY64lG2kFAlo2QUgACgkQfzzqY64l
 G2nIDg//ei/0pNFhk7ReSOnlN+dqR8ZGIelewBbLuB8s/eOFKYRcnk5c1LFXNDS+
 suH+QeMCVnGQOaHEdqE4aa/blRO3tP0JaLGcJ9shItxICQvPnVJb9qj27EPwX0mO
 rKgFgciI1aDPYIIbD7PYSum9opow+ga2HBZBpykAsrQEtZRsOSHxA7LNOop4hdfy
 KlGeVTWnGap4e21Zm5cePumDjBqm1I8tcf7n19j6QGXhTaIyN1RzhjWFH+Q/qoZW
 +CE3HPX5ATgWTjBM9AMj6O/B6mzM3c4yoBnBs3Q0Oz62w8fBvKrXIu4Mx5NXs3jD
 wwMUJXnvE/KPt/4rjOueeR3jhbqPZD3qEVGUXSkGhGZc3U63U5cELV7hvjZh/p3Z
 ymMcilk+IgLeIQED2uPg77Jja6klQTEA76jDfBmo3ozQDPyq7zMuvZZrpVBdDFFP
 5cP10J48PNwtGeMA5Nc0aAkWjIxbG3i+ovsnqPJ+UwspPVnufnhw9gPpcS+SsN+Z
 2PY9Z9V9C+f/9p+3CsWhGuiCTr0E9jF9+Wu+Ja6ElcuCtCwMlkTiZYJZ38mfD+eC
 SHKtxptrxhcoo6VgXjy/+5KwjScdfXI0KuDQIbOT97B74l3QNOkFQ21wFKyVGmsU
 ykf34tzpwHlOSWsnC3jVUEg7JZPNs63modgNuamy6iiE+ppviqQ=
 =jFh7
 -----END PGP SIGNATURE-----

Merge branch 'release/3.0.0' into develop