Merge pull request #64 from TheDMSGroup/dev

Upgrade to 2.15.0 official.
TheDMSGroup · Dec 19, 2018 · 22164cb · 22164cb
2 parents 1890e8f + be37ef1
commit 22164cb
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "description": "Mautic Open Source Distribution - Modified for scalability",
   "license": "GPL-3.0-only",
   "require": {
-    "mautic/core": "dev-master#23a0b3acb779b3e33b2e6ac65c629fd5c36caa0c",
+    "mautic/core": "dev-master#6d201acec18815ba274130e9ad8d34d1ae3bf5ce",
     "aws/aws-sdk-php": "3.36",
     "twig/twig": "v1.35.0"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/composer.lock.dev b/composer.lock.dev