projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac42470 d8a826d)
Merge branch 'master' of https://github.com/rollox/civicrm-core into CRM-18317
authoryashodha <yashodha.chaku@webaccessglobal.com>
Tue, 5 Apr 2016 05:27:33 +0000 (10:57 +0530)
committeryashodha <yashodha.chaku@webaccessglobal.com>
Tue, 5 Apr 2016 05:27:33 +0000 (10:57 +0530)
commite68d4035151c218b5e504883725fecd62eaea4ac
tree5dde4f60acd194b187034a24fab4d1dcec3047d2tree | snapshot (zip tar.gz)
parentac42470120235ed5d971352eec2557e58da3edb2commit | diff
parentd8a826dc8bdee44c2dc633170c1274979ebacf81commit | diff
Merge branch 'master' of https://github.com/rollox/civicrm-core into CRM-18317

Conflicts:
CRM/Utils/System/Drupal.php

----------------------------------------
* CRM-18317: Links to Drupal system broken if hook altered by a module
  https://issues.civicrm.org/jira/browse/CRM-18317
CRM/Admin/Page/Access.php diff1 | diff2 | blob | history
CRM/Utils/System/Drupal.php diff1 | diff2 | blob | history
CRM/Utils/System/DrupalBase.php diff1 | diff2 | blob | history