Merge branch 'mjog/550-always-show-images-not-saved' into 'gnome-3-34'
Always show images pref not saved
Closes #550 (closed)
See merge request !345 (merged)
(cherry picked from commit 3e7a9dac)
0c563cf1 Fix ContactStoreImpl not saving flags removed from a contact 0cf5ab73 Merge contacts when harvesting them 058ea2fa Update Contact::load_remote_resources with engine contact flags 10ddff2e Trivial docs update