tree 8495aaedc8deb4d29cd5964a0e907044c2c01b0b
parent 66d63abe6d6c4cfc001c2b4a4d19344ec138d9ae
parent d275d05514e15381037cfa92e367277501b3e54b
author Niels Lohmann <mail@nlohmann.me> 1564341816 +0200
committer Niels Lohmann <mail@nlohmann.me> 1564341816 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEeXFnrkHAptkjLkhFfzzqY64lG2kFAl099joACgkQfzzqY64l
 G2kqLw//YKyd5H58FjJKGhj0hwIDhQ5baIwSnRQYZvy5DIcjVf1319LJh1lzDxEB
 xHs8sb+Qw/Oj0Z1GSrm3+Hns9A0HUEIdgwTdThOu4dD0pQZscw2QqyVh67Ua0LuQ
 3JcbnLt71OIUMWfMI5y8h7R8FpixJ1A62B4vhxhZbazKKhQqWzNsuhdj9Gi+mqJ4
 aMiJFO6ahF+dWXvWeghbbOkL11kDk6qs2e1jTcdg89zeZVZi47rJx6+4/VcYNWUA
 CdDbw6/QGRghxlo1vMBMQlKXtsa9fsi+m28PxD4C4trosm8Q72Oar4xS6I5CfONJ
 Vs7Va4kNPcTH7ZKYb69eCFnLlVK5zErogUrD3fqG5E9h/k3nYhExTycvR4jiou7F
 xYT8ui68sBvlaXZILd0czR3OFqiU97/q/CDBSASR+XRQMIhA245/lnFAHaX83hwE
 i8NIjtZ2z5ugG2xXGyl8uQtB0OO5U+KEaXwx418RMZflSb9erfD0ctaGl4a3WpTw
 Alb4jE/1yLqHBIiKLB/gGO2RVAYbo8V1kg/u6ijJsgP0kJCtaBKQ1+ReYpEGq012
 7Ui2iRgBw52LnQ6nJz4KWBzju+4vJYHzm+hKd2Tny/x1TJEuXWBuF1Gh9n5f4eDr
 M/5nHJN3CeXNyQAAPxFnSqTELwOZKTNylUosMlkKb1dsNbUz7Y8=
 =yDiZ
 -----END PGP SIGNATURE-----

Merge branch 'release/3.7.0' into develop