mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 18:28:50 +09:00
61ef81c548
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
two_factor | ||
new.html.haml | ||
sign_in_token.html.haml | ||
two_factor.html.haml |