From 61744095a8ed9cdb3997ec41b3e9f8ab80387fe2 Mon Sep 17 00:00:00 2001
From: aspdye <aspdye@users.noreply.github.com>
Date: Tue, 24 May 2016 08:15:51 +0200
Subject: [PATCH] Update Roundcube to 1.2.0

closes #840
---
 CHANGELOG.md     | 7 +++++++
 setup/webmail.sh | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18598eb0..e3568cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+In Development
+--------------
+
+Mail:
+
+* Roundcube is updated to version 1.2.0.
+
 v0.18c (June 2, 2016)
 ---------------------
 
diff --git a/setup/webmail.sh b/setup/webmail.sh
index e6344ccc..bf29c6ab 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -34,8 +34,8 @@ apt-get purge -qq -y roundcube* #NODOC
 # Install Roundcube from source if it is not already present or if it is out of date.
 # Combine the Roundcube version number with the commit hash of vacation_sieve to track
 # whether we have the latest version.
-VERSION=1.1.5
-HASH=8A59D196EF0AA6D9C717B00699215135ABCB99CF
+VERSION=1.2.0
+HASH=2088985fb613b4e4e3373933ca44b26fce0489fb
 VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5
 PERSISTENT_LOGIN_VERSION=1e9d724476a370ce917a2fcd5b3217b0c306c24e
 HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5