Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ratiw committed Nov 2, 2017
2 parents 599841c + 9a18ff8 commit 9689690
Show file tree
Hide file tree
Showing 15 changed files with 11,663 additions and 4,568 deletions.
1 change: 0 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"presets": [
["env", { "modules": false }],
"es2015",
"stage-2"
],
"plugins": ["transform-runtime"],
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ The `.use` from above will register all the components globally.
```javascript
function install(Vue){
Vue.component("vuetable", Vuetable);
Vue.component("vuetable-pagination", VueTablePaginationInfo);
Vue.component("vuetable-pagination", VueTablePagination);
Vue.component("vuetable-pagination-dropdown", VueTablePaginationDropDown);
Vue.component("vuetable-pagination-info", VueTablePaginationInfo);
}
Expand All @@ -92,10 +92,10 @@ VueTablePaginationDropdown: VueTable.VueTablePaginationDropdown
# Contributions
Any contribution to the code (via pull request would be nice) or any part of the documentation and any idea and/or suggestion are very welcome.

> __Note__
> For any bug fix, the PR should be forked from the `master` branch. And for any suggestion or additional feature, the PR should be forked from the `develop` branch, where it can be integrated and rolled out in the next release.
> __Note__
> For any bug fix, the PR should be forked from the `master` branch. And for any suggestion or additional feature, the PR should be forked from the `develop` branch, where it can be integrated and rolled out in the next release.
>
> If you are not sure, please ask by openning a new issue.
> If you are not sure, please ask by openning a new issue.
However, please do not feel bad if your pull requests or contributions do not get merged or implemented into Vuetable.

Expand Down
2 changes: 1 addition & 1 deletion dist/stats.json

Large diffs are not rendered by default.

Loading

0 comments on commit 9689690

Please sign in to comment.