Claire 784e38f70b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
activity.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
adapter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
case_transform.rb	Add serializing/unserializing of "locked" actor attribute (#4585)	2017-08-12 17:41:03 +02:00
dereferencer.rb	Add support for dereferencing objects through bearcaps (#14683)	2020-08-30 12:34:20 +02:00
linked_data_signature.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00
tag_manager.rb	Fix addressing of remote groups' followers (#16700)	2021-09-08 23:33:23 +02:00