Merge branch 'master' into production

CESNET · Aug 26, 2022 · 81c10d3 · 81c10d3
2 parents ab6fe8f + d135fa9
commit 81c10d3
Show file tree

Hide file tree

Showing 296 changed files with 14,730 additions and 9,468 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,4 +54,7 @@ apps/consolidator/src/assets/config/instanceFavicon.ico
 apps/linker/src/assets/config/instanceConfig.json
 apps/linker/src/assets/config/instanceFavicon.ico
 
+#e2e dist files
+apps/admin-gui-e2e/dist
+
 .angular