diff options
author | Sonja Galovic <galovicsonja@gmail.com> | 2022-04-25 22:22:04 +0200 |
---|---|---|
committer | Sonja Galovic <galovicsonja@gmail.com> | 2022-04-25 22:22:04 +0200 |
commit | 1a3e9c2879fd9be723a195def352ae00e690a4fe (patch) | |
tree | 30f3ed9ef268d5f74784fb89c7dbcb939ab43e64 /frontend/package-lock.json | |
parent | 3e07b3304b65fcab6740a05231999dfc453ffbb9 (diff) | |
parent | f20f77226f0106ed2c9e2bb7b49550f5e5eb4c50 (diff) |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/src/app/app-routing.module.ts
# frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/package-lock.json')
-rw-r--r-- | frontend/package-lock.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b997f7c2..a62a1117 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3433,9 +3433,9 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "dependencies": { "lodash": "^4.17.14" @@ -14406,9 +14406,9 @@ "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "requires": { "lodash": "^4.17.14" |