Baptiste Lemoine b872c1c7c0 Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js		2020-02-12 10:03:28 +01:00
..
activitypub	Add basic support for group actors (#12071)	2019-12-04 20:36:33 +01:00
nodeinfo	Add openRegistrations attribute to nodeinfo endpoint (#12058)	2019-10-02 21:02:48 +02:00
rest	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
rss	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +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 setting for whether to crop images in unexpanded toots (#12126)	2019-10-24 22:51:41 +02:00
manifest_serializer.rb	Add method and enctype to manifest (#11767)	2019-09-05 15:51:51 +02:00
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	2019-03-25 15:01:09 +01: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