[geary: 4/4] Merge branch 'wip/fix-fedora-sqlite-tokeniser' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 6cb32164bb35afd28dcc5353bacd1480dc9ef5d1
Merge: f059778c 477ce6b8
Author: Michael Gratton <mike vee net>
Date:   Mon Jun 11 09:28:44 2018 +0000

    Merge branch 'wip/fix-fedora-sqlite-tokeniser' into 'master'
    
    Fix fedora sqlite tokeniser
    
    See merge request GNOME/geary!5

 .gitlab-ci.yml                 | 6 +++---
 src/sqlite3-unicodesn/static.c | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
---