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
..
activitypub
account_relationships_presenter.rb	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
initial_state_presenter.rb
instance_presenter.rb
status_relationships_presenter.rb