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
activity.rb
adapter.rb
case_transform.rb
dereferencer.rb
linked_data_signature.rb
serializer.rb
tag_manager.rb