Merge pull request #12053 from civicrm/5.1
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 29 Apr 2018 07:47:24 +0000 (19:47 +1200)
committerGitHub <noreply@github.com>
Sun, 29 Apr 2018 07:47:24 +0000 (19:47 +1200)
commitdaa46b94db74b842b7d7c6be293401672b637e7f
treed1f92a6f88c86bed3415e56b4a090d7a9362d0ec
parent270d9d5c1c2a592093e9ad62f7e942a91d6decb8
parenta519428f85f461a9b6ba7f4e89ff595c4cac3e9f
Merge pull request #12053 from civicrm/5.1

merge 5.1 to master
CRM/Contact/Form/Search.php
CRM/Contact/Form/Search/Criteria.php
CRM/Upgrade/Form.php
CRM/Utils/VersionCheck.php
templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl