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 fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2 years ago
..
custom_emoji_parser.rb	Add support for editing for published statuses (#16697)	3 years ago
media_attachment_parser.rb	Fix missing , (#18660)	2 years ago
poll_parser.rb	Add support for editing for published statuses (#16697)	3 years ago
status_parser.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago