adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into 2.0-pagination

Browse source 
Conflicts:
	cake/libs/http_socket.php
This commit is contained in:
mark_story 2010-12-26 21:02:04 -05:00
commit 9615370b72
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/VERSION.txt
View file

@ -17,7 +17,8 @@
// @license MIT License (http://www.opensource.org/licenses/mit-license.php) // @license MIT License (http://www.opensource.org/licenses/mit-license.php)
// +--------------------------------------------------------------------------------------------+ // // +--------------------------------------------------------------------------------------------+ //
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
1.3.6 2.0.0-dev

2
cake/config/config.php
View file

@ -16,4 +16,4 @@
* @since CakePHP(tm) v 1.1.11.4062 * @since CakePHP(tm) v 1.1.11.4062
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
return $config['Cake.version'] = '1.3.6'; return $config['Cake.version'] = '2.0.0-dev';