From 3435af9a6f5fdec2bc3817f93b11f5ed44a622f9 Mon Sep 17 00:00:00 2001 From: yashodha Date: Thu, 1 Oct 2015 10:37:34 +0530 Subject: [PATCH] fix the version for 4.7 --- CRM/Activity/ActionMapping.php | 2 +- CRM/Activity/Tokens.php | 2 +- CRM/Contact/ActionMapping.php | 2 +- CRM/Contact/Page/DedupeMerge.php | 6 +++--- CRM/Contribute/ActionMapping/ByPage.php | 2 +- CRM/Contribute/ActionMapping/ByType.php | 2 +- CRM/Contribute/Tokens.php | 2 +- CRM/Dashlet/Page/GettingStarted.php | 2 +- CRM/Event/ActionMapping.php | 2 +- CRM/Event/Tokens.php | 2 +- CRM/Member/ActionMapping.php | 2 +- CRM/Member/Tokens.php | 2 +- Civi/ActionSchedule/Mapping.php | 2 +- Civi/ActionSchedule/MappingInterface.php | 2 +- Civi/ActionSchedule/RecipientBuilder.php | 2 +- Civi/Token/AbstractTokenSubscriber.php | 2 +- api/v3/Navigation.php | 2 +- sql/civicrm_case_sql.mysql | 2 +- sql/civicrm_demo_processor.mysql | 2 +- sql/civicrm_devel_config.mysql | 2 +- sql/civicrm_generated.mysql | 2 +- sql/civicrm_sample_custom_data.mysql | 2 +- sql/trigger.mysql | 2 +- sql/upgrade_pcm.mysql | 2 +- templates/CRM/Contact/Page/DedupeMerge.tpl | 4 ++-- templates/CRM/Dashlet/Page/GettingStarted.tpl | 2 +- templates/CRM/common/civicrm.settings.php.template | 2 +- templates/CRM/common/success.tpl | 2 +- tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php | 2 +- tests/phpunit/CRM/Contribute/ActionMapping/ByTypeTest.php | 2 +- tests/phpunit/CRM/Financial/Page/AjaxTest.php | 2 +- 31 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CRM/Activity/ActionMapping.php b/CRM/Activity/ActionMapping.php index bf728ba43b..0511c16ea9 100644 --- a/CRM/Activity/ActionMapping.php +++ b/CRM/Activity/ActionMapping.php @@ -1,7 +1,7 @@

- {ts 1='https://civicrm.org/membership' 2='https://civicrm.org/contribute'}The CiviCRM Core Team has been hard at work and is proud to release 4.6, the first major update of 2015. Though it is packed with enhancements and continues to mature the leading open source CRM for nonprofits worldwide, it does come with a cost to produce, maintain and improve upon. Without funding from organizations like yours, future releases are at risk of never being realized. We invite you to enjoy the improvements in 4.6 and ask that you support CiviCRM by becoming a member or by making a donation. ~ Dave Greenberg, Co-Founder{/ts} + {ts 1='https://civicrm.org/membership' 2='https://civicrm.org/contribute'}The CiviCRM Core Team has been hard at work and is proud to release 4.7, the second major update of 2015. Though it is packed with enhancements and continues to mature the leading open source CRM for nonprofits worldwide, it does come with a cost to produce, maintain and improve upon. Without funding from organizations like yours, future releases are at risk of never being realized. We invite you to enjoy the improvements in 4.7 and ask that you support CiviCRM by becoming a member or by making a donation. ~ Dave Greenberg, Co-Founder{/ts}

{ts 1='https://civicrm.org/register-site'}Not ready for a membership yet? You can still help us learn how to improve CiviCRM by registering your site.{/ts} diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php index 8138ad988d..223ddb7e49 100644 --- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php +++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php @@ -1,7 +1,7 @@