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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		5 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
features	…
fixtures	…
helpers	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mailers	…
models	Update remote bio test from 160 to 500 (#10799)	5 years ago
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	5 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…