Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.		2021-01-11 11:55:42 +01:00
..
activity	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-11 11:55:42 +01:00
activity.rb
adapter.rb
case_transform.rb
dereferencer.rb
linked_data_signature.rb
serializer.rb
tag_manager.rb