From 8f3ad359442846125e526e9a60b981c08e584f93 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Wed, 4 Feb 2015 10:56:07 +0000 Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc --- .datatables-commit-sync | 2 +- bower.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 7ef5a626..9ee7b537 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -2255fc2f883deef1d28e6115042b597b43fb8490 +72b39fd7af8300fe09cbaf2a5f8e41956b15ff16 diff --git a/bower.json b/bower.json index 813b3e5d..6d6a26ae 100644 --- a/bower.json +++ b/bower.json @@ -3,7 +3,8 @@ "version": "1.10.5-dev", "main": [ "media/js/jquery.dataTables.js", - "media/css/jquery.dataTables.css" + "media/css/jquery.dataTables.css", + "media/images/*.png" ], "dependencies": { "jquery": ">=1.7.0"