Merge pull request #1976 from eileenmcnaughton/CRM-13737
authorcolemanw <coleman@civicrm.org>
Fri, 22 Nov 2013 23:14:31 +0000 (15:14 -0800)
committercolemanw <coleman@civicrm.org>
Fri, 22 Nov 2013 23:14:31 +0000 (15:14 -0800)
commit3272669c8a5dc06c3b49910ae98ae15a99cb801d
treeee686b02b057a498534628bb4eb6247c2fc516d6
parente44784454d6f226fa4d17bca912f9ce67e3dcd28
parentf4a6cab846de0a2f1ee132c538b0232ebc1dc51c
Merge pull request #1976 from eileenmcnaughton/CRM-13737

CRM-13737 drupal integration allow drupal folder to be at the same level as the civicrm folder