mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-08-20 07:15:14 +00:00
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. |
||
---|---|---|
.. | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |