From 1f5ec14c3c4d092d45b50cb9623e28292c950003 Mon Sep 17 00:00:00 2001
From: marquex <javi@arqex.com>
Date: Mon, 24 Aug 2015 18:03:01 +0200
Subject: [PATCH] Fixes accidentaly removed object-assign

---
 dist/react-datetime.min.js |    2 +-
 dist/react-datetime.js     |    2 +-
 package.json               |    4 ++--
 CHANGELOG.md               |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2d1b27..a808f32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 1.2.0
+## 1.2.1
 * Removed classlist-polyfill so the component can be used in the server side.
 
 ## 1.1.1
diff --git a/dist/react-datetime.js b/dist/react-datetime.js
index b1f7755..eb67443 100644
--- a/dist/react-datetime.js
+++ b/dist/react-datetime.js
@@ -1,5 +1,5 @@
 /*
-react-datetime v1.2.0
+react-datetime v1.2.1
 https://github.com/arqex/react-datetime
 MIT: https://github.com/arqex/react-datetime/raw/master/LICENSE
 */
diff --git a/dist/react-datetime.min.js b/dist/react-datetime.min.js
index 6e016d0..8ac0f9f 100644
--- a/dist/react-datetime.min.js
+++ b/dist/react-datetime.min.js
@@ -1,5 +1,5 @@
 /*
-react-datetime v1.2.0
+react-datetime v1.2.1
 https://github.com/arqex/react-datetime
 MIT: https://github.com/arqex/react-datetime/raw/master/LICENSE
 */
diff --git a/package.json b/package.json
index 81067ca..3dad39d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-datetime",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A lightweight but complete datetime picker React.js component.",
   "homepage": "https://github.com/arqex/react-datetime",
   "repository": {
@@ -39,7 +39,7 @@
     "webpack-dev-server": "^1.7.0"
   },
   "dependencies": {
-    "classlist-polyfill": "^1.0.1",
+    "object-assign": "^3.0.0",
     "react-onclickoutside": "^0.3.1"
   }
 }

--
Gitblit v1.9.3