Merge branch 'main' into separateNonFeaturedArticlesOnQuadrantView

# Conflicts:
#	.lintstagedrc
#	dist_scripts/src/model.js
#	src/animation.ts
#	src/components/Item/Item.tsx
#	src/components/ItemList/ItemList.tsx
#	src/components/PageItem/PageItem.tsx
#	src/index.scss
#	src/model.js
#	src/model.ts
This commit is contained in:
dennis.ludwig
2021-06-17 14:38:23 +02:00
parent 2160e067cf
commit 9f083e771c

View File

@@ -1,5 +0,0 @@
{
"*.{json, md, yml, js, ts, tsx, scss}": [
"prettier --write",
]
}