Merge branch 'master' into recipientnote
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 29 Oct 2019 11:58:14 +0000 (12:58 +0100)
committerGitHub <noreply@github.com>
Tue, 29 Oct 2019 11:58:14 +0000 (12:58 +0100)
commit530147774732d2b83a02c5ed00b14da223ce9665
tree7c8b5959ba3b7d2962d28ce9bbb3d3cbd5f7e8b8
parentd8dca83dd5d38df0e8acd4da14c40f59b45abc40
parent09c282d9ead388ae773746f9077eee92f2261b8b
Merge branch 'master' into recipientnote
src/gui/sharedialog.ui
src/gui/sharelinkwidget.ui