Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		2021-02-12 10:28:32 +01:00
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
adapter_spec.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	2019-03-27 15:55:23 +01:00
dereferencer_spec.rb	Add support for dereferencing objects through bearcaps (#14683)	2020-08-30 12:34:20 +02:00
linked_data_signature_spec.rb	Fixed code quality issues (#15541)	2021-01-31 21:26:09 +01:00
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00