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

This commit is contained in:
Weblate 2017-07-10 12:56:07 +00:00
commit ab95905472

View file

@ -248,7 +248,7 @@ module.exports = React.createClass({
{viewClearSourceButton} {viewClearSourceButton}
{unhidePreviewButton} {unhidePreviewButton}
{permalinkButton} {permalinkButton}
{UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null} {quoteButton}
{externalURLButton} {externalURLButton}
</div> </div>
); );