Merge remote-tracking branch 'origin/develop' into develop

2018-06-18 12:48:44 +00:00
parent 15892a8c6a 0d05250914
commit a8a8e358c6
1 changed files with 2 additions and 2 deletions
@@ -68,8 +68,8 @@ const FilePanel = React.createClass({
                    "room": {
                        "timeline": {
                            "contains_url": true,
-                            "not_types": [
+                            "types": [
-                                "m.sticker",
+                                "m.room.message",
                            ],
                        },
                    },