Jeremy Kescher ddc4022845 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js # app/lib/feed_manager.rb # app/services/batched_remove_status_service.rb # lib/mastodon/feeds_cli.rb		2023-03-15 14:13:29 +01:00
..
activitypub	serialize custom emoji reactions properly for AP	2022-12-09 23:08:44 +01:00
nodeinfo	Fix nodeinfo metadata attribute being an array instead of an object (#20114)	2022-11-08 17:26:11 +01:00
rest	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
web	Fix web push notifications containing HTML entities (#18071)	2022-04-23 21:47:43 +02:00
initial_state_serializer.rb	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
manifest_serializer.rb	Add maskable icon support for Android (#20904)	2022-11-17 10:52:30 +01:00
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
webfinger_serializer.rb