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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
assets	…
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
json_ld	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
paperclip	Fix converted media being saved with original extension and mime type (#11130)	6 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
cli.rb	Add `tootctl preview_cards remove` (#11320)	5 years ago