Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		2018-06-15 20:51:39 +02:00
..
activitypub	Bot nameplates (#7391)	2018-05-07 09:31:07 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-29 13:52:26 +02:00
rss
web	Do not encode HTML entities in initial Web Push payload body (#7592)	2018-05-22 18:12:45 +02:00
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-15 20:51:39 +02:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb