From: CiviCRM <info@civicrm.org>
Date: Wed, 20 Jan 2016 11:12:46 +0000 (-0800)
Subject: Update version to 4.7.0
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d3a594303fe39b585d40cd125b3cc0750f14d187;p=civicrm-core.git

Update version to 4.7.0
---

diff --git a/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl
new file mode 100644
index 0000000000..6cc7c4d415
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 4.7.0 during upgrade *}
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 4021e7bb0b..9918c6e71c 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.beta8',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/xml/version.xml b/xml/version.xml
index 712000627a..7cc895fe15 100644
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>4.7.beta8</version_no>
+  <version_no>4.7.0</version_no>
 </version>