Merge master and fix conflicts

1 files changed, 0 insertions, 1 deletions

diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp

index ab6540a4..ab0f8152 100644
--- a/src/MxcImageProvider.cpp
+++ b/src/MxcImageProvider.cpp
@@ -196,7 +196,6 @@ MxcImageProvider::download(const QString &id,
                                   image.setText("original filename",
                                                 QString::fromStdString(originalFilename));
                                   image.setText("mxc url", "mxc://" + id);
-                                  image.save(fileInfo.absoluteFilePath());
                                   then(id, requestedSize, image, fileInfo.absoluteFilePath());
                           });
                 } catch (std::exception &e) {