Curtis 6435bb0bc5 Resolved merge conflicts ... Merge branch 'develop' into 'translate_public_header' # Conflicts: # app/soapbox/features/public_layout/components/header.js		2020-08-07 20:53:42 +00:00
..
components	Resolved merge conflicts	2020-08-07 20:53:42 +00:00
index.js	class --> className	2020-06-04 21:13:38 -05:00