merging fixes to trunk. set version to 1.2.2.8120

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8120 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2009-03-19 20:25:10 +00:00
parent 3d4c5b424d
commit fc7773fe2d
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.1.8004
1.2.2.8120

View file

@ -22,5 +22,5 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
return $config['Cake.version'] = '1.2.1.8004';
return $config['Cake.version'] = '1.2.2.8120';
?>