Merge branch 'release/1.2.3' into develop

twilio · Jan 13, 2012 · e7ff3bc · e7ff3bc
2 parents b166eeb + 208caf2
commit e7ff3bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,6 +1,6 @@
 # OpenVBX Change Log
 
-## Next
+## OpenVBX 1.2.3
 
 - fix scoping bug on PHP 5.2 based servers that resulted from previous PluginData cache fix
 

diff --git a/OpenVBX/config/config.php b/OpenVBX/config/config.php
@@ -30,7 +30,7 @@
 | Used for asset url versioning.
 |
 */
-$config['site_rev'] = 1018;
+$config['site_rev'] = 1019;
 
 /*
 |--------------------------------------------------------------------------

diff --git a/OpenVBX/config/version.php b/OpenVBX/config/version.php
@@ -1,3 +1,3 @@
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-$config['version'] = '1.2.2';
+$config['version'] = '1.2.3';
diff --git a/updates/72.sql b/updates/72.sql
@@ -0,0 +1 @@
+UPDATE `settings` SET `value` = 72 WHERE `name` = 'schema-version';