Merge branch 'master' into clang-format

# Conflicts:
#	CMakeLists.txt
#	lib/avatar.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/connectiondata.cpp
#	lib/csapi/account-data.cpp
#	lib/csapi/account-data.h
#	lib/csapi/capabilities.cpp
#	lib/csapi/capabilities.h
#	lib/csapi/content-repo.cpp
#	lib/csapi/create_room.cpp
#	lib/csapi/filter.cpp
#	lib/csapi/joining.cpp
#	lib/csapi/keys.cpp
#	lib/csapi/list_joined_rooms.cpp
#	lib/csapi/notifications.cpp
#	lib/csapi/openid.cpp
#	lib/csapi/presence.cpp
#	lib/csapi/pushrules.cpp
#	lib/csapi/registration.cpp
#	lib/csapi/room_upgrades.cpp
#	lib/csapi/room_upgrades.h
#	lib/csapi/search.cpp
#	lib/csapi/users.cpp
#	lib/csapi/versions.cpp
#	lib/csapi/whoami.cpp
#	lib/csapi/{{base}}.cpp.mustache
#	lib/events/accountdataevents.h
#	lib/events/eventcontent.h
#	lib/events/roommemberevent.cpp
#	lib/events/stateevent.cpp
#	lib/jobs/basejob.cpp
#	lib/jobs/basejob.h
#	lib/networkaccessmanager.cpp
#	lib/networksettings.cpp
#	lib/room.cpp
#	lib/room.h
#	lib/settings.cpp
#	lib/settings.h
#	lib/syncdata.cpp
#	lib/user.cpp
#	lib/user.h
#	lib/util.cpp

1 files changed, 23 insertions, 23 deletions

diff --git a/lib/networkaccessmanager.h b/lib/networkaccessmanager.h
index ebaaa5b2..bf8f0cbc 100644
--- a/lib/networkaccessmanager.h
+++ b/lib/networkaccessmanager.h
@@ -22,27 +22,27 @@
 
 #include <memory>
 
-namespace QMatrixClient {
-    class NetworkAccessManager : public QNetworkAccessManager
-    {
-        Q_OBJECT
-        public:
-        NetworkAccessManager(QObject* parent = nullptr);
-        ~NetworkAccessManager() override;
-
-        QList<QSslError> ignoredSslErrors() const;
-        void addIgnoredSslError(const QSslError& error);
-        void clearIgnoredSslErrors();
-
-        /** Get a pointer to the singleton */
-        static NetworkAccessManager* instance();
-
-        private:
-        QNetworkReply*
-        createRequest(Operation op, const QNetworkRequest& request,
-                      QIODevice* outgoingData = Q_NULLPTR) override;
-
-        class Private;
-        std::unique_ptr<Private> d;
-    };
+namespace QMatrixClient
+{
+class NetworkAccessManager : public QNetworkAccessManager
+{
+    Q_OBJECT
+public:
+    NetworkAccessManager(QObject* parent = nullptr);
+    ~NetworkAccessManager() override;
+
+    QList<QSslError> ignoredSslErrors() const;
+    void addIgnoredSslError(const QSslError& error);
+    void clearIgnoredSslErrors();
+
+    /** Get a pointer to the singleton */
+    static NetworkAccessManager* instance();
+
+private:
+    QNetworkReply* createRequest(Operation op, const QNetworkRequest& request,
+                                 QIODevice* outgoingData = Q_NULLPTR) override;
+
+    class Private;
+    std::unique_ptr<Private> d;
+};
 } // namespace QMatrixClient