Alex Gleason 55b6bf52d0 Merge branch 'develop' into 'kaonashi696-develop-patch-45336' ... # Conflicts: # app/soapbox/locales/ca.json		2021-10-15 16:40:21 +00:00
..
fonts	Add UnusedFilesWebpackPlugin to detect unused files	2021-03-23 15:22:10 -05:00
images	Remove pro/floral CSS and background	2020-10-09 12:22:27 -06:00
instance	Webpack: copy files into /static instead of starting them there	2021-09-03 13:06:04 -05:00
soapbox	Merge branch 'develop' into 'kaonashi696-develop-patch-45336'	2021-10-15 16:40:21 +00:00
sounds	Webpack: copy files into /static instead of starting them there	2021-09-03 13:06:04 -05:00
styles	RegisterInvite: make registrations by invite token work	2021-09-24 12:16:28 -05:00
application.js	Webpack: use one entrypoint	2021-09-10 19:30:47 -05:00
index.ejs	noscript: "Soapbox" --> "this website"	2021-09-20 13:10:24 -05:00