Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.		2019-03-18 18:03:27 +01:00
..
activitypub	Set and store report URIs (#10303)	2019-03-17 15:34:56 +01:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
rss	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	2019-03-15 15:05:31 +01: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	Fix min/max duration poll limits being inverted	2019-03-08 20:43:18 +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