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 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin_mailer	…
application	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
auth	…
authorize_interactions	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	Add button to conveniently copy OAuth code (#11065)	6 years ago
public_timelines	…
relationships	…
remote_follow	…
remote_interaction	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
settings	Add option to disable real-time updates in web UI (#9984)	5 years ago
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	…
user_mailer	…
well_known	Add ActivityPub actor representing the entire server (#11321)	5 years ago