mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 23:54:52 +01:00
61ef81c548
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
challenges | ||
confirmations | ||
passwords | ||
registrations | ||
sessions | ||
setup | ||
shared |