Commit 430292b3 authored by Michael McAndrew's avatar Michael McAndrew

Merge branch 'master' of github.com:civicrm/civicrm-website-org

Conflicts:
	drupal/sites/all/modules/civicrm/CRM/Contact/BAO/Query.php
	drupal/sites/all/modules/civicrm/CRM/Core/xml/Menu/Contact.xml
	drupal/sites/all/modules/civicrm/civicrm-version.php
	drupal/sites/all/modules/civicrm/drupal/civicrm.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrm_contact_ref/civicrm_contact_ref.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrm_engage/civicrm_engage.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrm_group_roles/civicrm_group_roles.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrm_member_roles/civicrm_member_roles.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrm_og_sync/civicrm_og_sync.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrm_rules/civicrm_rules.info
	drupal/sites/all/modules/civicrm/drupal/modules/civicrmtheme/civicrmtheme.info
	drupal/sites/all/modules/civicrm/packages/composer.clean.sh
	drupal/sites/all/modules/civicrm/sql/civicrm_data.mysql
	drupal/sites/all/modules/civicrm/sql/civicrm_generated.mysql
	drupal/sites/all/modules/civicrm/templates/CRM/common/version.tpl
parents 529ded56 0b41532d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment