Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina
2021-03-23 21:25:39 +09:00
783 changed files with 5464 additions and 3649 deletions

View File

@@ -61,14 +61,13 @@
import { defineComponent } from 'vue';
import { faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck, faPollH } from '@fortawesome/free-solid-svg-icons';
import { faClock } from '@fortawesome/free-regular-svg-icons';
import { getNoteSummary } from '../../misc/get-note-summary';
import { getNoteSummary } from '@/misc/get-note-summary';
import XReactionIcon from './reaction-icon.vue';
import MkFollowButton from './follow-button.vue';
import notePage from '../filters/note';
import { userPage } from '../filters/user';
import { i18n } from '@/i18n';
import * as os from '@/os';
import { markNotificationRead } from '@/scripts/mark-notification-read';
import { i18n } from '@client/i18n';
import * as os from '@client/os';
export default defineComponent({
components: {