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		2019-12-19 13:52:54 +01:00
..
account_batch.rb
admin_settings.rb	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
challenge.rb
custom_emoji_batch.rb	Fix custom emoji category creation silently erroring out on duplicate category (#12647)	2019-12-18 16:56:59 +01:00
delete_confirmation.rb
redirect.rb
status_batch.rb
tag_batch.rb
two_factor_confirmation.rb