Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
activitypub	Add handler for Move activity (#9629)	2018-12-29 02:24:36 +01:00
rest	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
rss	…
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00