Merge branch 'dev' into feature-localization

This commit is contained in:
jonaswinkler committed 2020-12-31 15:59:47 +01:00
commit 1b8c4bb1a5
24 files changed
+82 -39

No files matched your search

+4 -2
View File
@@ -33,7 +33,8 @@
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
"src/manifest.webmanifest"
],
"styles": [
"src/styles.scss"
@@ -100,7 +101,8 @@
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
"src/manifest.webmanifest"
],
"styles": [
"src/styles.scss"