Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
activitypub	Fix NoMethodError in ActivityPub::NoteSerializer (#10172)	2019-03-05 05:09:01 +01:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
rss	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +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 quick links to the admin interface in the WebUI (#8545)	2019-01-04 13:10:43 +01:00
manifest_serializer.rb	Upgrade new Web Share Target API (#9963)	2019-02-02 01:26:49 +01:00
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	2017-09-12 05:39:38 +02:00
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00