Merge branch 'master' into cadet_option
authort3sserakt <t3ss@posteo.de>
Tue, 25 Jun 2019 13:53:30 +0000 (15:53 +0200)
committert3sserakt <t3ss@posteo.de>
Tue, 25 Jun 2019 13:53:30 +0000 (15:53 +0200)
commit28d3e0676f262e495c6d5c49bbedd5ce65502cee
tree3631b2f033a913aac3cd806e541e3391f0cec7e5
parentd2ed51b63d955a590a461e911a3d6fa6a9248fe5
parent17611641fe7da3d2711e1f20eaf2ee81faf0e702
Merge branch 'master' into cadet_option
src/cadet/cadet_api.c