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
..
controllers	Merge branch 'master' into glitch-soc/master	5 years ago
fabricators	Add bookmarks (#7107)	5 years ago
features	Fix typo in login feature-test. (#12651)	5 years ago
fixtures	…
helpers	…
lib	Merge branch 'master' into glitch-soc/master	5 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	…
presenters	…
requests	Fix localization test failing due to order of locale definitions (#12393)	5 years ago
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/master	5 years ago
support	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	Move rspec examples to tmp dir (#12539)	5 years ago