Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2019-04-10 09:16:08 +02:00
..
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb
email_mx_validator.rb
existing_username_validator.rb	Fix admin validation being too strict about usernames (#10449)	2019-04-06 17:53:17 +02:00
follow_limit_validator.rb
html_validator.rb	Change HTML validator to ignore all errors except unmatched tags (#10534)	2019-04-10 03:34:16 +02:00
note_length_validator.rb
poll_validator.rb	Allow set the voting period to just 5 minutes (#10525)	2019-04-09 17:02:12 +02:00
status_length_validator.rb
status_pin_validator.rb
unique_username_validator.rb
unreserved_username_validator.rb
url_validator.rb
vote_validator.rb	Fix vote validation for polls with multiple choices (#10138)	2019-03-03 23:41:30 +01:00