Merge branch 'dev'

quasarframework · Jun 20, 2019 · 3e2bf85 · 3e2bf85
2 parents 26b291b + 14fb6e5
commit 3e2bf85
Show file tree

Hide file tree

Showing 24 changed files with 443 additions and 274 deletions.
diff --git a/.npmignore b/.npmignore
@@ -7,3 +7,4 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 _redirects
+yarn.lock
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ quasar ext remove @quasar/qscroller
 Can be found [here](https://github.com/quasarframework/app-extension-qscroller/tree/master/demo).
 
 # Demo
-Demo [here](https://quasarframework.github.io/app-extension-qscroller/#/demo)
+Demo [here](https://quasarframework.github.io/app-extension-qscroller/demo)
 
 # Documentation
 Can be found [here](https://quasarframework.github.io/app-extension-qscroller/).
diff --git a/demo/package.json b/demo/package.json
@@ -13,15 +13,15 @@
     "test": "echo \"No test specified\" && exit 0"
   },
   "dependencies": {
-    "@quasar/extras": "^1.1.2",
-    "quasar": "^1.0.0-rc.4"
+    "@quasar/extras": "^1.1.3",
+    "quasar": "^1.0.0-rc.5"
   },
   "devDependencies": {
-    "@quasar/app": "^1.0.0-rc.6",
-    "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.9",
+    "@quasar/app": "^1.0.0-rc.7",
+    "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.12",
     "@quasar/quasar-app-extension-qscroller": "link:../.",
     "@vue/eslint-config-standard": "^4.0.0",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "^10.0.2",
     "eslint": "^5.16.0",
     "eslint-loader": "^2.1.2",
     "eslint-plugin-vue": "^5.2.2"