Permalink
Browse files

merging fixes to trunk

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8004 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information...
1 parent d75b063 commit 9f83e96fb9ddaf69c9b9df51b69dcf115c41dc01 gwoo committed Jan 16, 2009
Showing with 2 additions and 2 deletions.
  1. +1 −1 cake/VERSION.txt
  2. +1 −1 cake/config/config.php
View
@@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
-1.2.0.7962
+1.2.1.8004
View
@@ -22,5 +22,5 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
-return $config['Cake.version'] = '1.2.0.7962';
+return $config['Cake.version'] = '1.2.1.8004';
?>

0 comments on commit 9f83e96

Please sign in to comment.