Commit f15f369d authored by christianrhansen's avatar christianrhansen

Merge branch 'master' of...

Merge branch 'master' of gitlab.rlp.net:motionbank/mbjs/quasar-components-shared into 263-shared---navibar-revision

 Conflicts:
	navigation/BreadcrumbNav.vue
	navigation/PageSubNav.vue
	navigation/UserNav.vue
	navigation/UserNavButton.vue
parent 1a3392ce
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -43,14 +43,14 @@
},
"dependencies": {
"auth0-js": "9.8.2",
"axios": "^0.18.0",
"axios": "^0.18.1",
"bluebird": "3.5.3",
"cote": "^0.20.0",
"ffprobe-static": "^3.0.0",
"jwt-decode": "^2.2.0",
"keytar": "^4.10.0",
"luxon": "1.8.2",
"marked": "0.5.2",
"marked": "^0.7.0",
"mbjs-api-client": "2.0.0",
"mbjs-archive": "1.0.0",
"mbjs-data-models": "1.3.2",
......@@ -106,7 +106,7 @@
"metapak-motionbank": "1.16.0",
"pug": "^2.0.3",
"pug-plain-loader": "^1.0.0",
"quasar-cli": "0.17.20",
"quasar-cli": "^0.17.26",
"static-server": "^2.2.1",
"strip-ansi": "^3.0.1"
},
......
Subproject commit eb4fb8ee496c55138185a28b7a986bc0cc32a84a
Subproject commit 7b01a7e0c419c20a7335c91648425eb9e04c0e06
Markdown is supported
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