Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
activitypub	…
rest	…
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	…
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…