Merge branches 'fetch-binary-cte' and 'network-unavailable-and-offline-are-different'
commit45aa61b6357d6b370a66d4da99a976e598e00fb0
authorJan Kundrát <jkt@kde.org>
Thu, 12 Jan 2017 08:30:14 +0000 (12 09:30 +0100)
committerJan Kundrát <jkt@kde.org>
Thu, 12 Jan 2017 08:30:29 +0000 (12 09:30 +0100)
tree90b430833fec94562e320bef2656fe704a7b2614
parent2ccb4b78d64e5361226a6a2257e395811894b6f0
parentdc563cf4f6476afad684b3c8e6ebd820233ab07f
parentd40814e520e7f57cec738c58d14d3daa05951ed1
Merge branches 'fetch-binary-cte' and 'network-unavailable-and-offline-are-different'

Change-Id: I54eaa575154402ced0d1d0592a73edabfccf3c44
src/Imap/Model/Model.cpp