You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		5 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
nodeinfo	Add `openRegistrations` attribute to nodeinfo endpoint (#12058)	5 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
rss	Split AccountsHelper from StatusesHelper (#12078)	5 years ago
web	Only display web push notifications after API call (fixes #7902) (#8396)	6 years ago
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifest_serializer.rb	Add method and enctype to manifest (#11767)	5 years ago
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	6 years ago
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago