This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... 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.		2023-02-03 19:23:27 +01:00
..
admin.js	Fix “Add new domain block” button using last submitted instead of current search value (#22485)	2023-01-05 13:42:38 +01:00
application.js	…
common.js	…
error.js	…
public-path.js	Remove unused ESLint disable directives (#22427)	2023-01-30 02:11:50 +01:00
public.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
share.js	…