mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-03 01:35:23 +00:00
392ca0472a
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes. |
||
---|---|---|
.. | ||
blacklisted_email_validator_spec.rb | ||
disallowed_hashtags_validator_spec.rb | ||
email_mx_validator_spec.rb | ||
follow_limit_validator_spec.rb | ||
note_length_validator_spec.rb | ||
poll_validator_spec.rb | ||
reaction_validator_spec.rb | ||
status_length_validator_spec.rb | ||
status_pin_validator_spec.rb | ||
unique_username_validator_spec.rb | ||
unreserved_username_validator_spec.rb | ||
url_validator_spec.rb |