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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
chewy	Fix NameError (#11192)	5 years ago
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mailers	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
serializers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
workers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago