mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-04 05:54:27 +00:00
3550470c18
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours. |
||
---|---|---|
.. | ||
exports | ||
two_factor_authentication | ||
applications_controller_spec.rb | ||
deletes_controller_spec.rb | ||
exports_controller_spec.rb | ||
flavours_controller_spec.rb | ||
follower_domains_controller_spec.rb | ||
imports_controller_spec.rb | ||
keyword_mutes_controller_spec.rb | ||
migrations_controller_spec.rb | ||
notifications_controller_spec.rb | ||
preferences_controller_spec.rb | ||
profiles_controller_spec.rb | ||
two_factor_authentications_controller_spec.rb |