Merge branch 'develop' into 1392-unmapped-posts

ushahidi · Mar 22, 2017 · 44c4563 · 44c4563
2 parents e8447be + 71041f0
commit 44c4563
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "kohana/minion" : "3.3.*@dev",
         "ohanzee/database": "~0.1.2",
         "robmorgan/phinx": "~0.4.1",
-        "shadowhand/email": "~2.0.1",
+        "ushahidi/shadowhand-email": "dev-master",
         "symm/gisconverter": "~1.0.5",
         "twilio/sdk": "3.12.*",
         "vlucas/phpdotenv": "~1.0@dev",

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