mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 06:46:29 +00:00
61ef81c548
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper.rb | ||
application_helper.rb | ||
domain_control_helper.rb | ||
email_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
languages_helper.rb | ||
mascot_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb | ||
webfinger_helper.rb |