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

This commit is contained in:
Weblate 2018-06-18 12:48:44 +00:00
commit a8a8e358c6

View file

@ -68,8 +68,8 @@ const FilePanel = React.createClass({
"room": { "room": {
"timeline": { "timeline": {
"contains_url": true, "contains_url": true,
"not_types": [ "types": [
"m.sticker", "m.room.message",
], ],
}, },
}, },