Curtis ea94b05608 Resolve merge conflicts ... Merge branch 'develop' into 'admin_cfg' # Conflicts: # app/soapbox/features/compose/components/action_bar.js # app/soapbox/features/edit_profile/index.js		2020-08-09 23:02:48 +00:00
..
footer.js	gabsocial --> soapbox paths	2020-05-28 17:56:55 -05:00
header.js	Multi-Factor Auth with OTP	2020-08-07 20:17:13 +00:00
site_banner.js	Fix site logo and banner rendering when no logo or banner is set	2020-08-02 20:52:23 -06:00
site_logo.js	Fix site logo and banner rendering when no logo or banner is set	2020-08-02 20:52:23 -06:00