projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf97091 9821de7)
Merge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM...
authorkurund <kurund@civicrm.org>
Tue, 9 Dec 2014 10:48:45 +0000 (16:18 +0530)
committerkurund <kurund@civicrm.org>
Tue, 9 Dec 2014 10:48:45 +0000 (16:18 +0530)
commit22fd90d480014f0a551b25bea675a03d2153de78
treeef0a85f979058d965360df68d74a001d7760cdcdtree | snapshot (zip tar.gz)
parentbf97091bc0dc6b712672f164454a63acd37e88a7commit | diff
parent9821de7dca7759776137007bd0cb72bfa475eb04commit | diff
Merge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM-14696

Conflicts:
CRM/Price/BAO/PriceField.php

----------------------------------------
* CRM-14696: Improve display for sold out price set options
  https://issues.civicrm.org/jira/browse/CRM-14696
CRM/Price/BAO/PriceField.php diff1 | diff2 | blob | history
css/civicrm.css diff1 | diff2 | blob | history