cakephp2-php8/cake
predominant 92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
..
config Updating version numbers to 1.3.0-RC4 2010-04-12 22:27:18 -04:00
console Merge remote branch 'origin/1.3' into 2.0 2010-04-16 23:43:28 +10:00
libs Merge remote branch 'origin/1.3' into 2.0 2010-04-16 23:43:28 +10:00
tests Merge remote branch 'origin/1.3' into 2.0 2010-04-16 23:43:28 +10:00
basics.php Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
bootstrap.php Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
dispatcher.php Merge remote branch 'origin/1.3' into 2.0 2010-04-16 23:43:28 +10:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers to 1.3.0-RC4 2010-04-12 22:27:18 -04:00