You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 2a2af880b8 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.		4 years ago
..
activitypub	Add E2EE API (#13820)	5 years ago
account_relationships_presenter.rb	Add user notes on accounts (#14148)	4 years ago
initial_state_presenter.rb	Add visibility parameter in share page (#13023)	4 years ago
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
status_relationships_presenter.rb	Fix n+1 query for bookmarks on statuses (#12494)	5 years ago