projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c22fd7 d9883c8)
Merge branch 'PalanteJon-CRM-17552-v2'
authorColeman Watts <coleman@civicrm.org>
Mon, 18 Jan 2016 19:37:40 +0000 (14:37 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 18 Jan 2016 19:37:40 +0000 (14:37 -0500)
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl


Trivial merge