Set version to 5.18.0

diff --git a/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
new file mode 100644 (file)
index 0000000..34af8cc
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.18.0 during upgrade *}

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 2771b7c7578b59f870d16811f44b1a707d03f192..570e310bdfc1c2ee2e822f60b02e61018a026172 100644 (file)
--- 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,'5.18.beta1',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,'5.18.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 e6b00f4eb629de867cb13407d2acb887c2fa6e0f..21081c4bc7d310ad57077ca04d92c42593c8eeb7 100644 (file)
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.18.beta1</version_no>
+  <version_no>5.18.0</version_no>
 </version>