Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.		2023-10-17 21:35:07 +02:00
..
core	Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream	2023-09-15 20:08:09 +02:00
flavours	[Glitch] Fix scroll position in thread view reseting when closing a modal	2023-10-10 19:53:59 +02:00
fonts
hooks
icons
images	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream	2023-10-17 21:35:07 +02:00
packs	Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream	2023-10-09 21:12:28 +02:00
skins
styles	Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream	2023-10-08 17:10:39 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00