• Charles Lindsay's avatar
    Merge branch 'master' into feature/search · fca993fe
    Charles Lindsay authored
    Conflicts:
    	sql/version-010.sql
    	src/client/folder-list/folder-list-folder-entry.vala
    	src/engine/rfc822/rfc822-message.vala
    
    Also, I had to manually fix some compile errors introduced due to
    interfaces changing on master.
    fca993fe
version-011.sql 220 Bytes