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

This commit is contained in:
Weblate 2018-02-15 14:51:18 +00:00
commit 5e8ec9f451

View File

@ -1121,9 +1121,9 @@ var TimelinePanel = React.createClass({
// exist.
if (this.state.timelineLoading) {
return (
<div className={this.props.className + " mx_RoomView_messageListWrapper"}>
<Loader />
</div>
<div className="mx_RoomView_messagePanelSpinner">
<Loader />
</div>
);
}