Commit ce3237ac authored by Petar Hristov's avatar Petar Hristov 💬
Browse files

Merge remote-tracking branch 'remotes/origin/master' into Sprint/2021-2022

# Conflicts:
#	src/LoginApp.vue
#	yarn.lock-workspace
parents 34d8c390 7c4be954
{
"name": "@coscine/login",
"version": "1.18.1",
"version": "1.19.0",
"private": true,
"directories": {
"doc": "docs"
......@@ -72,5 +72,5 @@
]
},
"license": "MIT",
"packageManager": "yarn@3.1.0"
"packageManager": "yarn@3.1.1"
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment