Merge branch 'develop' into beta

This commit is contained in:
ThatOneCalculator 2023-06-06 12:17:30 -07:00
commit df69149826
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
1 changed files with 1 additions and 1 deletions

View File

@ -52,7 +52,7 @@ import { UserProfiles } from "@/models/index.js";
import { In } from "typeorm"; import { In } from "typeorm";
import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js"; import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
import { truncate } from "@/misc/truncate.js"; import { truncate } from "@/misc/truncate.js";
import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";\ import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";
import { fetchMeta } from "@/misc/fetch-meta.js"; import { fetchMeta } from "@/misc/fetch-meta.js";
const logger = apLogger; const logger = apLogger;