[geary: 2/2] Merge branch 'mjog/coc-enforcement-update' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit b02c0a15cbac5d8665a7d4d61acfdeea60d11e46
Merge: 17ba93f2 15160e1d
Author: Michael Gratton <mike vee net>
Date:   Wed Apr 8 03:01:19 2020 +0000

    Merge branch 'mjog/coc-enforcement-update' into 'mainline'
    
    code-of-conduct.md: Actually specify an address for reporting abuse
    
    See merge request GNOME/geary!493

 code-of-conduct.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---