From f427ee52b45c73c3b25af90a1d9473293b7cdc02 Mon Sep 17 00:00:00 2001
From: "dennis.ludwig" <dennis.ludwig@aoe.com>
Date: Thu, 17 Jun 2021 14:38:58 +0200
Subject: [PATCH] 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
---
 .lintstagedrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.lintstagedrc.json b/.lintstagedrc.json
index 0429977..ae6a6c4 100644
--- a/.lintstagedrc.json
+++ b/.lintstagedrc.json
@@ -1,3 +1,3 @@
 {
-  "*.{json, md, yml, js, ts, tsx}": ["prettier --write"]
+  "*.{json, md, yml, js, ts, tsx, scss}": ["prettier --write"]
 }