mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 21:03:27 +00:00
5085559b15
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu. |
||
---|---|---|
.. | ||
blacklisted_email_validator.rb | ||
disallowed_hashtags_validator.rb | ||
email_mx_validator.rb | ||
existing_username_validator.rb | ||
follow_limit_validator.rb | ||
html_validator.rb | ||
note_length_validator.rb | ||
poll_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unique_username_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb | ||
vote_validator.rb |