From: CiviCRM <info@civicrm.org>
Date: Thu, 2 Jun 2016 04:28:15 +0000 (-0700)
Subject: Update version to 4.6.18
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c2c51a386d13f3cf8028cd1dc2eaaa991ed62951;p=civicrm-core.git

Update version to 4.6.18
---

diff --git a/CRM/Upgrade/Incremental/sql/4.6.18.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.18.mysql.tpl
new file mode 100644
index 0000000000..8317dce026
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/4.6.18.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 4.6.18 during upgrade *}
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 489fc1ec2c..3d1c0aaf49 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.6.17',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.6.18',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 76883249b2..f10f3fc3a4 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.6.17</version_no>
+  <version_no>4.6.18</version_no>
 </version>