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
..
components	Resolve merge conflicts	2020-08-09 23:02:48 +00:00
index.js	class --> className	2020-06-04 21:13:38 -05:00