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_spec.rb | ||
| disallowed_hashtags_validator_spec.rb | ||
| email_mx_validator_spec.rb | ||
| follow_limit_validator_spec.rb | ||
| poll_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 | ||