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 ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		5 years ago
..
assets	…
chewy/strategy	Fix records not being indexed sometimes (#12024)	5 years ago
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	…
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/master	5 years ago
paperclip	Update ESLint and RuboCop in Code Climate (#12534)	5 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
templates	…
cli.rb	Add `tootctl preview_cards remove` (#11320)	5 years ago