about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/ui/components/modal_root.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-18 09:14:28 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-18 09:14:28 -0600
commite27eedbd08c7d6191531783f662d576ea940a337 (patch)
tree06ec271b921b19339d2c5ea68c87b49d2d4f835f /app/javascript/flavours/glitch/features/ui/components/modal_root.js
parent201e82686f86d06e10afb62184a091417b09d5ad (diff)
parent708ec07e27dd02d03f2d155bcc61ae8de4c10c4a (diff)
Merge branch 'gs-master' into merge-upstream
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/modal_root.js')
-rw-r--r--app/javascript/flavours/glitch/features/ui/components/modal_root.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js
index a3e734867..e12ee1761 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js
@@ -124,7 +124,7 @@ export default class ModalRoot extends React.PureComponent {
                 (<BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
                   {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />}
                 </BundleContainer>) :
-              null
+                null
             }
           </div>
         </div>