Merge branch 'develop' into feature/thumbnail_upload

# Conflicts: # package-lock.json # projects/common/src/fm/common.module.ts
2021-02-25 20:18:59 +01:00
parent a098f72b1a 535f6bd064
commit dd71b49502
9 changed files with 130 additions and 14 deletions
--- a/package.json
+++ b/package.json
@@ -41,7 +41,8 @@
    "tassign": "^1.0.0",
    "tslib": "^2.0.0",
    "zone.js": "~0.10.2",
-    "moment": "^2.27.0"
+    "moment": "^2.27.0",
+    "ngx-avatar": "^4.0.0"
  },
  "devDependencies": {
    "@angular-builders/custom-webpack": "~10.0.1",