1
0
mirror of https://github.com/DataTables/DataTables.git synced 2024-11-28 10:24:10 +01:00

Merge branch 'master' of github.com:DataTables/DataTables

Conflicts:
	composer.json
	media/src/DataTables.js
This commit is contained in:
Allan Jardine 2013-12-12 09:27:54 +00:00
commit 802a600944

View File

@ -13,3 +13,4 @@
"source": "https://github.com/DataTables/DataTablesSrc/"
}
}