mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
61ef81c548
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
_domain_blocks.html.haml | ||
_login.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |