Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire committed 2021-04-21 13:52:03 +02:00
commit 536892b8ae
10 files changed
+100 -88

No files matched your search

@@ -53,7 +53,7 @@ const messages = defineMessages({
publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
});
const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started/);
const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started|^\/start/);
export default @(component => injectIntl(component, { withRef: true }))
class ColumnsArea extends ImmutablePureComponent {