Merge changes Ib95dd5ab,Icdcef7ee,I0bc87d27
commit13e5444b69ddb5d4f56d93adcae409c9ca93c906
authorJan Kundrát <jkt@kde.org>
Mon, 6 Mar 2017 09:45:31 +0000 (6 10:45 +0100)
committerGerrit Code Review <noreply@kde.org>
Mon, 6 Mar 2017 09:45:31 +0000 (6 10:45 +0100)
tree819c39eebd2d86f9d3c909e89fa8ccd3e5c3d8e0
parent7ca6cf8315042dfe53a5fcee63784a4f8f80f2ec
parentca257c4a10cf356d52db881e1977d39c2ac982b5
Merge changes Ib95dd5ab,Icdcef7ee,I0bc87d27

* changes:
  icons: Use Breeze's places/folder-cloud for mail archives
  GUI: Archive: Do not allow moving from Archive to Archive
  Archiving support
src/Gui/SettingsDialog.cpp