Merge branch 'master' into master
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Wed, 11 Sep 2019 20:06:22 +0000 (22:06 +0200)
committerGitHub <noreply@github.com>
Wed, 11 Sep 2019 20:06:22 +0000 (22:06 +0200)
commit45bd869a151e15d7e4d792ef052ddc173f2c7480
tree7394f813a68298abeda8f11f9bbe8d4d5a1c6201
parentac24874585001aea76e19a688477348defcacd29
parent51ff031de58ce01361172584d505cd626a0f59c7
Merge branch 'master' into master
src/gui/networksettings.ui