[geary: 2/2] Merge branch 'wip/web-extension-usr-local' into 'master'

[Michael Gratton <mjog src gnome org>]

commit abccccd6858ceea185aa820e39d64870aa07eaac
Merge: 07c7150e 1877c81d
Author: Michael Gratton <mike vee net>
Date:   Mon Jan 21 00:54:01 2019 +0000

    Merge branch 'wip/web-extension-usr-local' into 'master'
    
    Fix web extension not being loaded when installed under /usr/local on Fedora
    
    Closes #162 and #161
    
    See merge request GNOME/geary!89

 meson.build                                   |  2 ++
 src/client/application/geary-application.vala | 15 +++++++--------
 src/meson.build                               |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
---