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.

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.		4 years ago
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
adapter_spec.rb	…
dereferencer_spec.rb	Add support for dereferencing objects through bearcaps (#14683)	4 years ago
linked_data_signature_spec.rb	Fixed code quality issues (#15541)	4 years ago
tag_manager_spec.rb	…