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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
activitypub	Do not check for file existence when serializing ActivityPub actor (#8386)	6 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
rss	Add RSS feeds for end-users (#7259)	6 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	6 years ago
manifest_serializer.rb	implement web share target (#6278)	6 years ago
oembed_serializer.rb	Clean up and improve generated OpenGraph tags (#4901)	7 years ago
webfinger_serializer.rb	Add remote interaction dialog for toots (#8202)	6 years ago