Merge tag 'upstream/7.6.0'

Upstream version 7.6.0

1 files changed, 13 insertions, 0 deletions

diff --git a/bower_components/moment/src/lib/create/from-object.js b/bower_components/moment/src/lib/create/from-object.js
new file mode 100644
index 0000000..af8e082
--- /dev/null
+++ b/bower_components/moment/src/lib/create/from-object.js
@@ -0,0 +1,13 @@
+import { normalizeObjectUnits } from '../units/aliases';
+import { configFromArray } from './from-array';
+
+export function configFromObject(config) {
+    if (config._d) {
+        return;
+    }
+
+    var i = normalizeObjectUnits(config._i);
+    config._a = [i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond];
+
+    configFromArray(config);
+}