Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json
#	settings/Modules.ts
#	src/assets/images/socials/twitter.svg
#	src/components/AboutHome.vue
#	src/components/AdHome.vue
#	src/components/Footer.vue
#	src/components/Header.vue
#	src/components/PresentationAbout.vue
#	src/pages/blog/_slug.vue
This commit is contained in:
2021-06-01 23:14:36 +02:00
6 changed files with 16 additions and 6 deletions

View File

@@ -113,7 +113,7 @@ import {
useMeta,
useRoute, useStatic, watch
} from "@nuxtjs/composition-api";
import {Post} from "../../../types/types";
import {Post} from "../../../@types/types";
export default defineComponent({
name: "blog",