Sean King 71d40b3dd6 Merge branch 'develop' into 'remote_follow' ... # Conflicts: # app/soapbox/features/account/components/header.js		2020-08-18 17:24:12 +00:00
..
fonts	Fonts: spinster --> soapbox	2020-06-09 20:14:18 -05:00
images	add video and audio media placeholders in compose form	2020-08-10 20:59:24 -05:00
soapbox	Merge branch 'develop' into 'remote_follow'	2020-08-18 17:24:12 +00:00
styles	Merge branch 'deactivated-accounts' into 'develop'	2020-08-18 03:15:02 +00:00
application.js	Webpack: Reduce to one entrypoint, app/application.js	2020-05-28 18:46:24 -05:00
index.ejs	Add <!--server-generated-meta-->	2020-07-15 10:59:44 -05:00