You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		2 years ago
..
admin.js	Fix “Add new domain block” button using last submitted instead of current search value (#22485)	2 years ago
application.js	Fix missing await (#19273)	2 years ago
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
public-path.js	Remove unused ESLint disable directives (#22427)	2 years ago
public.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
share.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago