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.

Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		6 years ago
..
activitypub	Always send content for backwards-compatibility (#7844)	7 years ago
rest	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
rss	…
web	Do not encode HTML entities in initial Web Push payload body (#7592)	7 years ago
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…