Commit 369d42d
committed
Update upstream to mastodon/mastodon@5bc69ea
1 parent e1f0ade commit 369d42d
1 file changed
Lines changed: 1 addition & 1 deletion
- app/controllers/collections_controller.rb+14-2
- app/javascript/mastodon/features/account_edit/index.tsx+2-1
- app/javascript/mastodon/features/account_edit/modals/fields_modals.tsx+13-7
- app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx+2-1
- app/javascript/mastodon/features/emoji/database.ts+5
- app/javascript/mastodon/features/emoji/normalize.ts+8-13
- app/javascript/mastodon/features/home_timeline/components/announcements/index.tsx+2-1
- app/javascript/mastodon/hooks/useCustomEmojis.ts+35
- app/lib/activitypub/tag_manager.rb+1-1
- app/views/admin/collections/show.html.haml+1-1
- app/views/admin/shared/_collection.html.haml+1-1
- config/routes.rb+3-1
- spec/requests/collections_spec.rb+15-3
- spec/serializers/activitypub/featured_collection_serializer_spec.rb+1-1
0 commit comments