Skip to content

Commit 3e2bf85

Browse files
committed
Merge branch 'dev'
2 parents 26b291b + 14fb6e5 commit 3e2bf85

24 files changed

+443
-274
lines changed

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ npm-debug.log*
77
yarn-debug.log*
88
yarn-error.log*
99
_redirects
10+
yarn.lock

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ quasar ext remove @quasar/qscroller
3030
Can be found [here](https://github.com/quasarframework/app-extension-qscroller/tree/master/demo).
3131

3232
# Demo
33-
Demo [here](https://quasarframework.github.io/app-extension-qscroller/#/demo)
33+
Demo [here](https://quasarframework.github.io/app-extension-qscroller/demo)
3434

3535
# Documentation
3636
Can be found [here](https://quasarframework.github.io/app-extension-qscroller/).

demo/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"test": "echo \"No test specified\" && exit 0"
1414
},
1515
"dependencies": {
16-
"@quasar/extras": "^1.1.2",
17-
"quasar": "^1.0.0-rc.4"
16+
"@quasar/extras": "^1.1.3",
17+
"quasar": "^1.0.0-rc.5"
1818
},
1919
"devDependencies": {
20-
"@quasar/app": "^1.0.0-rc.6",
21-
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.9",
20+
"@quasar/app": "^1.0.0-rc.7",
21+
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.12",
2222
"@quasar/quasar-app-extension-qscroller": "link:../.",
2323
"@vue/eslint-config-standard": "^4.0.0",
24-
"babel-eslint": "^10.0.1",
24+
"babel-eslint": "^10.0.2",
2525
"eslint": "^5.16.0",
2626
"eslint-loader": "^2.1.2",
2727
"eslint-plugin-vue": "^5.2.2"

0 commit comments

Comments
 (0)