91f66ece5a
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change. |
||
---|---|---|
.. | ||
admin.js | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.js | ||
share.js |