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	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
account_relationships_presenter.rb	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
initial_state_presenter.rb	Add visibility parameter in share page (#13023)	2020-06-09 00:16:30 +02:00
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
status_relationships_presenter.rb	Fix n+1 query for bookmarks on statuses (#12494)	2019-11-28 04:08:00 +01:00