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)
commit6d57015351b3dcd1701edcefff21eec506a65257
tree3631b2f033a913aac3cd806e541e3391f0cec7e5
parent2b9a4912dc103f0649cc4ba43aaf19e95cf9463d
parent17611641fe7da3d2711e1f20eaf2ee81faf0e702
Merge branch 'master' into cadet_option
src/cadet/cadet_api.c