Forward porting our changes
authorLisa Marie Maginnis <lisam@fsf.org>
Mon, 6 Oct 2014 15:03:49 +0000 (11:03 -0400)
committerDavid Thompson <davet@gnu.org>
Wed, 17 Dec 2014 19:48:00 +0000 (14:48 -0500)
commit33694bd85c565cbf35e26e753d7887b95d1032e2
treea7f47b96e46f3dbc71c6dc8bd03ed8b6b1818221
parent697cd5c8c5bd147dfd92155cf28507c06c1e04af
Forward porting our changes

Conflicts:

packages/snappy/src/Knp/Snappy/Pdf.php
CRM/Contact/Form/Task/PDFLatexCommon.php
CRM/Member/Import/Form/DataSource.php
CRM/Utils/PDF/Utils.php
packages/snappy/src/Knp/Snappy/Pdf.php [new file with mode: 0644]