Forward porting our changes crm-dev
authorLisa Marie Maginnis <lisam@fsf.org>
Mon, 6 Oct 2014 15:03:49 +0000 (11:03 -0400)
committerDavid Thompson <davet@gnu.org>
Mon, 6 Oct 2014 15:51:24 +0000 (11:51 -0400)
commitf484fc84b03a700ebec20bb8f71bfe971f92f06d
tree32094e5652a7c5e32143d8fc05ead22851daf502
parente66f2a8c3907a3fe4589305d624cb7391170d95e
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]