projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 413796c 05e92f5)
Merge branch 'merge-forward' of github.com:dpradeep/civicrm-core into invoice-fixes
authorkurund <kurund@civicrm.org>
Fri, 8 Aug 2014 14:59:15 +0000 (20:29 +0530)
committerkurund <kurund@civicrm.org>
Fri, 8 Aug 2014 14:59:15 +0000 (20:29 +0530)
commitdc0bdd343322076cc07366a193a9811c25a31b10
tree293883a8e2e251f29cbeeaf035a7c388146c7b5etree | snapshot (zip tar.gz)
parent413796ce91c4cb1724b5ead58e0eb41e1c8aac94commit | diff
parent05e92f54e095797f90465740fa745db41596f644commit | diff
Merge branch 'merge-forward' of github.com:dpradeep/civicrm-core into invoice-fixes

Conflicts:
CRM/Contribute/Form/Task/Invoice.php
CRM/Contribute/Form/Task/Invoice.php diff1 | diff2 | blob | history