[geary/geary-0.12: 2/2] Merge branch 'wip/11-special-folder-children-0.12' into 'geary-0.12'

[Michael Gratton <mjog src gnome org>]

commit f2cfcf262d0b3077ca819d17ec9974abc61f0752
Merge: a1341507 903719bd
Author: Michael Gratton <mike vee net>
Date:   Fri Jul 6 03:02:33 2018 +0000

    Merge branch 'wip/11-special-folder-children-0.12' into 'geary-0.12'
    
    Ensure a folder's sidebar children are re-added when its type changes.
    
    See merge request GNOME/geary!20

 src/client/application/geary-controller.vala | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
---