[geary: 2/2] Merge branch 'mjog/remove-markup-from-translatable-strings' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 902f161c352d5311cb8d7d64171937092313c6be
Merge: 0e269a35 f2be8ef5
Author: Michael Gratton <mike vee net>
Date:   Tue Mar 17 08:39:04 2020 +0000

    Merge branch 'mjog/remove-markup-from-translatable-strings' into 'mainline'
    
    ConverationViewerMessage: Pull markup out of translatable strs
    
    See merge request GNOME/geary!440

 src/client/conversation-viewer/conversation-message.vala | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
---