[geary: 2/2] Merge branch 'mjog/766-search-deadlock' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 99730af3cea7f2ba0dbe8aa33636672843a06e69
Merge: 6a17da4e ee2c66a3
Author: Michael Gratton <mike vee net>
Date:   Sat Apr 4 02:27:12 2020 +0000

    Merge branch 'mjog/766-search-deadlock' into 'mainline'
    
    ConversationWebView: Avoid a deadlock cancelling search highlighting
    
    Closes #766
    
    See merge request GNOME/geary!486

 src/client/conversation-viewer/conversation-web-view.vala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---