From: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed, 13 Apr 2016 07:22:08 +0000 (+0530)
Subject: Merge pull request #8124 from monishdeb/CRM-18396
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=73921c298a6c2751e67622687d0db321c312d3d5;p=civicrm-core.git

Merge pull request #8124 from monishdeb/CRM-18396

CRM-18396: Type error when deduping contacts with custom file field
---

73921c298a6c2751e67622687d0db321c312d3d5