From 72a23f814e7076c5b31c3e084b7dc897e9c9ccd9 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 5 May 2016 15:43:36 +0000 Subject: [PATCH] MNT-16256: Merged 5.1.N (5.1.2) to 5.1.1 (5.1.1) 126145 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 126143 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path. - This commit will be merged to all HF branches so that it will be included in all future HFs. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/bitrock/imagemagick.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/bitrock/imagemagick.xml b/src/main/resources/bitrock/imagemagick.xml index f3bfbaa46a..58fc07db20 100644 --- a/src/main/resources/bitrock/imagemagick.xml +++ b/src/main/resources/bitrock/imagemagick.xml @@ -290,7 +290,7 @@ export GS_LIB - +