Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		2020-04-02 20:32:00 +02:00
..
exports	Add CSV export for lists and domain blocks (#9677)	2019-01-01 13:44:04 +01:00
migration
preferences
two_factor_authentication
aliases_controller.rb
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
identity_proofs_controller.rb
imports_controller.rb
migrations_controller.rb
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
two_factor_authentications_controller.rb