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

@@ -4,7 +4,7 @@
<nuxt-link to="/env" class="block h-auto md:w-2/5">
<Ad color="rose" class="w-full flex flex-col justify-between items-center">
<div>
<img class="h-48" src="~/assets/images/memojies/Dev.png" alt="Dev Memoji" />
<img class="h-48" src="~/assets/images/memojies/Dev.png" alt="Dev Memoji" />
</div>
<div>
<h1 class="font-bold text-black text-4xl">