Merge branch 'master' of github.com:esvit/ng-table · esvit/ng-table@9b98345 · GitHub

Commit

Merge branch 'master' of github.com:esvit/ng-table

Browse files

Conflicts:
	src/scripts/04-controller.js

Loading branch information

iyel committed Feb 26, 2015

2 parents c28fcec + f5bc695 commit 9b98345