diff --git a/.datatables-commit-sync b/.datatables-commit-sync index b3524896..fc5fec39 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -e227ba9d2c7dcec842d4e020d8cc4e45d3c885e5 +d13c078c5bf4b82dd4cfccf22928132aa9d52344 diff --git a/bower.json b/bower.json index e63ebbff..817a5637 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "datatables", - "version": "1.10.2-dev", + "version": "1.10.2", "main": [ "media/js/jquery.dataTables.js", "media/css/jquery.dataTables.css" diff --git a/composer.json b/composer.json index 31c86146..37bf16af 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "datatables/datatables", - "version": "1.10.2-dev", + "version": "1.10.2", "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.", "homepage": "http://www.datatables.net/", "author": "SpryMedia", diff --git a/dataTables.jquery.json b/dataTables.jquery.json index 155a25e4..4819fc3e 100644 --- a/dataTables.jquery.json +++ b/dataTables.jquery.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.2-dev", + "version": "1.10.2", "description": "DataTables enhances HTML tables with the ability to sort, filter and page the data in the table very easily. It provides a comprehensive API and set of configuration options, allowing you to consume data from virtually any data source.", "homepage": "http://datatables.net/", "docs": "http://datatables.net/", diff --git a/media/js/jquery.dataTables.min.js b/media/js/jquery.dataTables.min.js index 63d94fc6..98ced50b 100644 --- a/media/js/jquery.dataTables.min.js +++ b/media/js/jquery.dataTables.min.js @@ -1,4 +1,4 @@ -/*! DataTables 1.10.2-dev +/*! DataTables 1.10.2 * ©2008-2014 SpryMedia Ltd - datatables.net/license */ (function(za,O,l){var N=function(h){function T(a){var b,c,d={};h.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),d[c]=e,"o"===b[1]&&T(a[e])});a._hungarianMap=d}function G(a,b,c){a._hungarianMap||T(a);var d;h.each(b,function(e){d=a._hungarianMap[e];if(d!==l&&(c||b[d]===l))"o"===d.charAt(0)?(b[d]||(b[d]={}),h.extend(!0,b[d],b[e]),G(a[d],b[d],c)):b[d]=b[e]})}function N(a){var b=p.defaults.oLanguage,c=a.sZeroRecords; diff --git a/package.json b/package.json index 6409a1c4..5e28bfda 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.2-dev", + "version": "1.10.2", "title": "DataTables", "author": { "name": "Allan Jardine",