projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2cc66fc e4b8a0b)
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-16-17-51-20
authorkurund <kurund@civicrm.org>
Mon, 16 Feb 2015 12:46:40 +0000 (18:16 +0530)
committerkurund <kurund@civicrm.org>
Mon, 16 Feb 2015 12:46:40 +0000 (18:16 +0530)
commit6fd0519667b8c37759460c6c1516a22210418aa5
tree8c5a63a480cb3b0aabc3fd0ee2730ea14169b15atree | snapshot (zip tar.gz)
parent2cc66fc051ad64b7f08b169eb4bf0bae8890f89ccommit | diff
parente4b8a0b282031d011e587b211b7adb1992c088f6commit | diff
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-16-17-51-20

Conflicts:
CRM/Upgrade/Incremental/php/FourFour.php
CRM/Upgrade/Incremental/php/FourFour.php diff1 | diff2 | blob | history