Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-28 16:22:28 +02:00
nodeinfo	Add “services” and “metadata” to NodeInfo (#18563)	2022-06-01 16:24:07 +02:00
rest	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
web	Fix web push notifications containing HTML entities (#18071)	2022-04-23 21:47:43 +02:00
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 22:29:05 +02:00
manifest_serializer.rb	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
oembed_serializer.rb
webfinger_serializer.rb