mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
1d6152f440
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both. |
||
|---|---|---|
| .. | ||
| exports | ||
| two_factor_authentication | ||
| applications_controller_spec.rb | ||
| deletes_controller_spec.rb | ||
| exports_controller_spec.rb | ||
| flavours_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| imports_controller_spec.rb | ||
| migrations_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| preferences_controller_spec.rb | ||
| profiles_controller_spec.rb | ||
| sessions_controller_spec.rb | ||
| two_factor_authentications_controller_spec.rb | ||