Skip to content

Commit

Permalink
rebased with develop upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
rubinsh committed Oct 19, 2017
2 parents aad08e4 + 3b42ec6 commit 7a95d6c
Show file tree
Hide file tree
Showing 9 changed files with 4,537 additions and 4,825 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![npm](https://img.shields.io/npm/v/vuetable-2.svg)](https://www.npmjs.com/package/vuetable-2)
[![npm](https://img.shields.io/npm/dt/vuetable-2.svg)](https://www.npmjs.com/package/vuetable-2)
[![npm](https://img.shields.io/npm/l/vuetable-2.svg?maxAge=2592000)]()

# Vuetable-2 - data table simplify!
Expand Down Expand Up @@ -91,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 7a95d6c

Please sign in to comment.