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

2017-07-10 12:56:07 +00:00 · 2017-07-10 12:56:07 +00:00 · ab95905472
commit ab95905472
parent 61e5fd759a c1b8879b6b
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@ -248,7 +248,7 @@ module.exports = React.createClass({
                {viewClearSourceButton}
                {unhidePreviewButton}
                {permalinkButton}
-                {UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null}
+                {quoteButton}
                {externalURLButton}
            </div>
        );