mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 22:14:58 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ab95905472
@ -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>
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user