Merge master into branch-4.0-dev

nicolethoen · Feb 22, 2017 · 5a9dcce · 5a9dcce
2 parents db5c3b7 + efd1192
commit 5a9dcce
Show file tree

Hide file tree

Showing 95 changed files with 192,261 additions and 18,420 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -195,6 +195,7 @@ module.exports = function (grunt) {
           'dist/js/patternfly-functions-vertical-nav.min.js': ['src/js/patternfly-functions-vertical-nav.js'],
           'dist/js/patternfly.dataTables.pfEmpty.min.js':  ['src/js/patternfly.dataTables.pfEmpty.js'],
           'dist/js/patternfly.dataTables.pfFilter.min.js': ['src/js/patternfly.dataTables.pfFilter.js'],
+          'dist/js/patternfly.dataTables.pfPagination.min.js': ['src/js/patternfly.dataTables.pfPagination.js'],
           'dist/js/patternfly.dataTables.pfResize.min.js': ['src/js/patternfly.dataTables.pfResize.js'],
           'dist/js/patternfly.dataTables.pfSelect.min.js': ['src/js/patternfly.dataTables.pfSelect.js']
         }