Merge commit '65c3d1bf3868ad3e1caec9fc77021735df53f989' into issue-711

This commit is contained in:
laf
2015-04-13 15:48:29 +01:00
22 changed files with 3643 additions and 1665 deletions
+8 -8
View File
@@ -1,7 +1,7 @@
{
"name": "bootstrap-datetimepicker",
"main": "src/js/bootstrap-datetimepicker.js",
"version": "3.1.3",
"version": "4.7.14",
"repository": {
"type": "git",
"url": "https://github.com/eonasdan/bootstrap-datetimepicker.git"
@@ -15,21 +15,21 @@
"datepicker",
"datetimepicker",
"timepicker",
"moment"
"moment"
],
"dependencies": {
"moment": "~2.8.1",
"bootstrap": "^3.0",
"jquery": "^1.8.3"
"moment": "~2.8.2",
"bootstrap": "^3.0",
"jquery": "latest"
},
"devDependencies": {
"grunt": "latest",
"grunt-contrib-jasmine": "^0.7.0",
"grunt-contrib-jshint": "latest",
"grunt-contrib-less": "latest",
"grunt-contrib-uglify": "latest",
"grunt-jscs": "latest",
"load-grunt-tasks": "latest",
"grunt-string-replace": "latest",
"grunt-contrib-less": "latest",
"bootstrap": "latest"
"load-grunt-tasks": "latest"
}
}