mastodon/app/serializers
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.
2018-07-09 07:13:59 +02:00
..
activitypub Always send content for backwards-compatibility (#7844) 2018-06-18 23:58:13 +02:00
rest Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
rss Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
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 implement web share target (#6278) 2018-01-17 17:08:10 +01:00
oembed_serializer.rb
webfinger_serializer.rb Remove rabl dependency (#5894) 2017-12-06 15:04:49 +09:00