Merging changes into the trunk:

Revision: [5819]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5821 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-10-20 13:34:31 +00:00
parent f7a4ca1b53
commit 0457fb9411
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ // // +---------------------------------------------------------------------------------------------------+ //
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.5818 pre-beta 1.2.0.5821 pre-beta

View file

@ -24,5 +24,5 @@
* @lastmodified $Date$ * @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/ */
$config['Cake.version'] = '1.2.0.5818 pre-beta'; $config['Cake.version'] = '1.2.0.5821 pre-beta';
?> ?>