projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0545a81 ea72e63)
Merge pull request #7900 from sarehag/CRM-17558
authorcolemanw <coleman@civicrm.org>
Wed, 9 Mar 2016 15:46:17 +0000 (10:46 -0500)
committercolemanw <coleman@civicrm.org>
Wed, 9 Mar 2016 15:46:17 +0000 (10:46 -0500)
Crm 17558:Resolving conflicted for labels by changing id for one group.


Trivial merge