From f0fa9324d83ea1bd57f0b702e3b419f7194169cb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 21 Apr 2016 02:13:52 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 composer.json-dist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/composer.json-dist b/composer.json-dist
index 58c50c7..f14541c 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -28,7 +28,7 @@
         "pear-pear.php.net/net_idna2": "~0.1.1",
         "pear-pear.php.net/mail_mime": "~1.10.0",
         "pear-pear.php.net/net_smtp": "~1.7.1",
-        "pear-pear.php.net/crypt_gpg": "~1.4.0",
+        "pear-pear.php.net/crypt_gpg": "~1.4.1",
         "roundcube/net_sieve": "~1.5.0"
     },
     "require-dev": {

--
Gitblit v1.9.1