Merge branch 'main' into glitch-soc/merge-upstream

2022-12-21 15:59:39 +01:00
parent ba15694003 c4a429ed47
commit b248aa4d3e
308 changed files with 4729 additions and 1538 deletions
--- a/app/javascript/mastodon/features/compose/util/counter.js
+++ b/app/javascript/mastodon/features/compose/util/counter.js
@ -6,4 +6,4 @@ export function countableText(inputText) {
  return inputText
    .replace(urlRegex, urlPlaceholder)
    .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3');
-};
+}