projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cec1762 df03ce4)
Merge branch '4.7.14-rc' into master
authorColeman Watts <coleman@civicrm.org>
Thu, 24 Nov 2016 01:20:26 +0000 (20:20 -0500)
committerColeman Watts <coleman@civicrm.org>
Thu, 24 Nov 2016 01:20:26 +0000 (20:20 -0500)
Conflicts:
CRM/Utils/System/DrupalBase.php


Trivial merge