From 33d295f42cb4a59a8a0af358c45ebe995b28bf8e Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Tue, 2 Jan 2018 12:37:12 +0300
Subject: [PATCH] Merge branch 'master' into skeleton

---
 package-lock.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b3510a13..946539cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -483,39 +483,34 @@
       "dev": true
     },
     "angular-calendar": {
-      "version": "0.22.3",
-      "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.22.3.tgz",
-      "integrity": "sha512-+5/rUaUoggQ2iNIAcwazl5xc1d9BDxR6QA8nmJsp+JWRaMPaoWoxA6njz8Mns1U6XSqrkcQYyhLSmTWHOpyNAQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.23.0.tgz",
+      "integrity": "sha512-/FrZx80RXI55gabVWnHFl1uX0jPbZ9PEjeR4QbkVkNGQaejucKwkOtPcUJ1+oHRB0fjJdm3ZN9sb4D/Kya2SjQ==",
       "requires": {
-        "angular-draggable-droppable": "1.1.1",
-        "angular-resizable-element": "1.2.4",
-        "calendar-utils": "0.0.59",
+        "angular-draggable-droppable": "2.0.0",
+        "angular-resizable-element": "2.0.0",
+        "calendar-utils": "0.0.60",
         "date-fns": "1.29.0",
         "positioning": "1.3.1"
       },
       "dependencies": {
-        "calendar-utils": {
-          "version": "0.0.59",
-          "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.59.tgz",
-          "integrity": "sha512-rj9knfXAIgGJFKAGmrYw8TNfy1FyTCzhd3utZPBC7fZS9HNeQsHGa9xwNtes/LDjdHYCnw4TM0BW/PxTB6hghQ=="
+        "angular-draggable-droppable": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-2.0.0.tgz",
+          "integrity": "sha512-/b8LIGamjOKnDI2uG1jRUErTIHeQ3w2WqHn4cbeiUTy+6eNHjkQI32DNhvxl0nVxr2gF5QluECNB4uWjMMyzQg=="
+        },
+        "angular-resizable-element": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-2.0.0.tgz",
+          "integrity": "sha512-Jsa818fxtAtBA3Fp1u4mWV9tcpakM+bNYFFbB/AjKig2BtzZkeyLx3vjcBCfwPmXkK10kX2QKR8RDALk1w209A=="
         }
       }
     },
-    "angular-draggable-droppable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-1.1.1.tgz",
-      "integrity": "sha512-peha7H6EtuigMcdsbRinTOqUbQf+TDQ/Sgxme0xs0/Rk6dpFDZdEw0G/O89BG0q1mNQyOnYMdgf+wX0OfJDp7g=="
-    },
     "angular-in-memory-web-api": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/angular-in-memory-web-api/-/angular-in-memory-web-api-0.5.2.tgz",
       "integrity": "sha1-/y6mZqv9BN19FslT7JcuExigmCQ="
     },
-    "angular-resizable-element": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-1.2.4.tgz",
-      "integrity": "sha512-unMWXfmx02zfX4BUpvA+S+9/+QfXowRvS57jwGIV+Vhnl+9wTYHaHnoQS/dpiUpNrtuFw2K1V5/Fcz5ZHpxsww=="
-    },
     "angular2-markdown": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/angular2-markdown/-/angular2-markdown-1.6.0.tgz",
@@ -1227,6 +1222,11 @@
         "y18n": "3.2.1"
       }
     },
+    "calendar-utils": {
+      "version": "0.0.60",
+      "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.60.tgz",
+      "integrity": "sha512-45lyGf+9XZdq+gWUzeu0PwrbkH2lkxxAa2XdaVG1Jr8ENLLwajkThvJVMf1LruRHz6gF/MJcnWSgCCTJpNVGRQ=="
+    },
     "callsite": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",