aeacebb3d7
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. |
||
|---|---|---|
| .. | ||
| actions | ||
| components | ||
| containers | ||
| features | ||
| locales | ||
| middleware | ||
| reducers | ||
| selectors | ||
| service_worker | ||
| store | ||
| utils | ||
| api.js | ||
| base_polyfills.js | ||
| blurhash.js | ||
| common.js | ||
| compare_id.js | ||
| extra_polyfills.js | ||
| initial_state.js | ||
| is_mobile.js | ||
| load_keyboard_extensions.js | ||
| load_polyfills.js | ||
| main.js | ||
| performance.js | ||
| permissions.js | ||
| ready.js | ||
| scroll.js | ||
| settings.js | ||
| stream.js | ||
| test_setup.js | ||
| uuid.js | ||