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

This commit is contained in:
Weblate 2017-10-14 22:49:39 +00:00
commit dd948272c5

View file

@ -84,10 +84,6 @@ const Notifier = {
msg = ''; msg = '';
} }
const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(
ev.sender, 40, 40, 'crop',
) : null;
const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(ev.sender, 40, 40, 'crop') : null; const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(ev.sender, 40, 40, 'crop') : null;
const notif = plaf.displayNotification(title, msg, avatarUrl, room); const notif = plaf.displayNotification(title, msg, avatarUrl, room);