ab5ff638f2
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 |
||
|---|---|---|
| .. | ||
| exports | ||
| preferences | ||
| two_factor_authentication | ||
| applications_controller_spec.rb | ||
| deletes_controller_spec.rb | ||
| exports_controller_spec.rb | ||
| featured_tags_controller_spec.rb | ||
| flavours_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| imports_controller_spec.rb | ||
| migrations_controller_spec.rb | ||
| profiles_controller_spec.rb | ||
| sessions_controller_spec.rb | ||
| two_factor_authentications_controller_spec.rb | ||