Merge branch 'master' into next
authorArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thu, 5 Aug 2021 19:48:03 +0000 (21:48 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thu, 5 Aug 2021 19:48:15 +0000 (21:48 +0200)
commit838bc2c0fb37a3fb9b6137694413961b49b24e67
tree14cf1d415317d1b0f81b5d99d1b8929076d9c1e0
parent74974d5e2f916e0794676c99b8b7a1ce791e90ca
parenta8a9b12766a434e7d70cd246689d4de11d440875
Merge branch 'master' into next

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
DEVELOPERS
package/usbguard/usbguard.mk
package/wireshark/wireshark.mk