projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e977de5 4aef802)
Merge branch '468' of vcs.fsf.org:civicrm-core into fixups (lisas tree and rubens...
authorLisa Marie Maginnis <lisam@fsf.org>
Thu, 15 Oct 2015 00:13:57 +0000 (20:13 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Thu, 15 Oct 2015 00:13:57 +0000 (20:13 -0400)
commit6e24724b587e3ab4ec517ed6ab959facc014fa4a
tree6aa4da7333f4b72712776f9ceaed1c3100d90c32tree | snapshot (zip tar.gz)
parente977de5b9438f45873c58a871ae6759f1fc88559commit | diff
parent4aef802d5eb8c8f4fa9be6d87288e746cb5bb7d7commit | diff
Merge branch '468' of vcs.fsf.org:civicrm-core into fixups (lisas tree and rubens tree)

Conflicts:
CRM/ACL/BAO/Cache.php
CRM/Contact/Task.php
CRM/Contribute/Task.php
CRM/Core/Resources.php
CRM/Utils/PDF/Utils.php
api/v3/Contact.php
api/v3/Contribution.php
CRM/ACL/BAO/Cache.php diff1 | diff2 | blob | history
CRM/Contact/Task.php diff1 | diff2 | blob | history
CRM/Contribute/Task.php diff1 | diff2 | blob | history
CRM/Utils/PDF/Utils.php diff1 | diff2 | blob | history
api/v3/Contact.php diff1 | diff2 | blob | history
api/v3/Contribution.php diff1 | diff2 | blob | history