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

This commit is contained in:
Weblate 2018-07-11 08:10:33 +00:00
commit d8d7ff223f

View file

@ -215,7 +215,7 @@ export default class Stickerpicker extends React.Component {
width: this.popoverWidth, width: this.popoverWidth,
}} }}
> >
<PersistedElement containerId="mx_persisted_stickerPicker" style={{zIndex: STICKERPICKER_Z_INDEX}}> <PersistedElement persistKey="stickerPicker" style={{zIndex: STICKERPICKER_Z_INDEX}}>
<AppTile <AppTile
collectWidgetMessaging={this._collectWidgetMessaging} collectWidgetMessaging={this._collectWidgetMessaging}
id={stickerpickerWidget.id} id={stickerpickerWidget.id}