Merge remote-tracking branch 'orange/master'

1 files changed, 0 insertions, 12 deletions

diff --git a/makefu/5pkgs/kalauerbot/matrixbot.patch b/makefu/5pkgs/kalauerbot/matrixbot.patch
deleted file mode 100644
index 2b9bbbea1..000000000
--- a/makefu/5pkgs/kalauerbot/matrixbot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/matrixbot/matrixbot.py b/matrixbot/matrixbot.py
-index 8e5598c..d8c23d2 100644
---- a/matrixbot/matrixbot.py
-+++ b/matrixbot/matrixbot.py
-@@ -51,7 +51,6 @@ class MatrixBot:
-         self.user = None
-         if self.token is not None and self.user_id is not None:
-             self.user = self.client.get_user(self.user_id)
--            self.user.set_display_name(self.display_name)
-             self.init_rooms(self.client.rooms)
-             self.invite_listener = self.client.add_invite_listener(self.handle_invite)
-         self.cache = Cache(dbfile=cache_db)