mastodon/app/serializers
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
..
activitypub Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +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-07-16 14:50:42 +02:00
manifest_serializer.rb implement web share target (#6278) 2018-01-17 17:08:10 +01:00
oembed_serializer.rb
webfinger_serializer.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00