[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00
parent 6ca9a7c998 d40091afc5
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
--- a/src/components/views/context_menus/StatusMessageContextMenu.js
+++ b/src/components/views/context_menus/StatusMessageContextMenu.js
@@ -27,8 +27,8 @@ export default class StatusMessageContextMenu extends React.Component {
        user: PropTypes.object,
    };

-    constructor(props, context) {
-        super(props, context);
+    constructor(props) {
+        super(props);

        this.state = {
            message: this.comittedStatusMessage,