Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:esvit/ng-table
Conflicts: src/scripts/04-controller.js
- Loading branch information