Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		2020-06-30 23:00:20 +02:00
..
account_finder_concern_spec.rb	…
account_interactions_spec.rb	…
remotable_spec.rb	Fix trying to write non-existent image remote URL attribute on preview cards (#14181)	2020-06-29 17:59:04 +02:00
status_threading_concern_spec.rb	…