mastodon-glitch/app/serializers
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
activitypub Bot nameplates (#7391) 2018-05-07 09:31:07 +02:00
rest Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
rss Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
web Add REST API for Web Push Notifications subscriptions (#7445) 2018-05-11 11:49:12 +02:00
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
manifest_serializer.rb implement web share target (#6278) 2018-01-17 17:08:10 +01:00
oembed_serializer.rb Clean up and improve generated OpenGraph tags (#4901) 2017-09-12 05:39:38 +02:00
webfinger_serializer.rb Remove rabl dependency (#5894) 2017-12-06 15:04:49 +09:00