Baptiste Lemoine aff743695a Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/account/components/header.js # config/webpack/production.js # db/schema.rb # yarn.lock		2020-09-21 14:36:15 +02:00
..
activitypub	Add outbox attribute to instance actor (#14721)	2020-09-02 18:42:50 +02:00
nodeinfo	Add openRegistrations attribute to nodeinfo endpoint (#12058)	2019-10-02 21:02:48 +02:00
rest	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
rss	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb	Add visibility parameter in share page (#13023)	2020-06-09 00:16:30 +02:00
manifest_serializer.rb	Add method and enctype to manifest (#11767)	2019-09-05 15:51:51 +02:00
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
user_group_serializer.rb	prototype for groups	2019-08-27 17:05:17 +02:00
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	2019-08-01 19:14:02 +02:00