Claire b81710c02c Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.

2021-01-26 14:01:30 +01: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

2020-12-15 14:27:06 +01:00

status_relationships_presenter.rb

Use Enumerable#filter_map in more places (#15527)

2021-01-22 16:28:15 +01:00