projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecd8e62 6a2fb48)
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5
authorEileen McNaughton <eileen@fuzion.co.nz>
Wed, 24 Sep 2014 04:15:02 +0000 (16:15 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Wed, 24 Sep 2014 04:15:02 +0000 (16:15 +1200)
commitd92623decb352eab5b403d0c9cab181a831bfaac
tree6f40b5c334c68983ac58ad2fdbcda9c1be1fb582tree | snapshot (zip tar.gz)
parentecd8e62122ea5dc6277cb64a600d4ae1a3794494commit | diff
parent6a2fb4893515078788edd00f27860e9244aa96c9commit | diff
Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5

Conflicts:
CRM/Core/DAO.php
CRM/Financial/BAO/FinancialAccount.php
CRM/Financial/BAO/FinancialType.php
tests/phpunit/api/v3/CaseTest.php
tests/phpunit/api/v3/SyntaxConformanceTest.php
tests/phpunit/api/v3/CaseTest.php diff1 | diff2 | blob | history