Merge branch 'master' into 'privacy_screen'

# Conflicts:
#   resources/qml/TimelineView.qml

1 files changed, 0 insertions, 6 deletions

diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml

index cb7d383f..4c73f28b 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -273,12 +273,6 @@ Rectangle {
                     cursorShape: Qt.IBeamCursor
                     onClicked: TimelineManager.timeline.input.paste(true)
                 }
-
-                NhekoDropArea {
-                    anchors.fill: parent
-                    roomid: TimelineManager.timeline ? TimelineManager.timeline.roomId() : ""
-                }
-
             }
 
             ScrollBar.vertical: ScrollBar {