f3eff922a3
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. |
||
---|---|---|
.. | ||
accounts_cli.rb | ||
cache_cli.rb | ||
cli_helper.rb | ||
domains_cli.rb | ||
emoji_cli.rb | ||
feeds_cli.rb | ||
media_cli.rb | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
preview_cards_cli.rb | ||
redis_config.rb | ||
search_cli.rb | ||
settings_cli.rb | ||
snowflake.rb | ||
statuses_cli.rb | ||
version.rb |