Jose Lorenzo Rodriguez 9d07fc4330 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/ShellDispatcher.php lib/Cake/Utility/CakeNumber.php lib/Cake/View/Elements/sql_dump.ctp		2013-08-11 23:31:10 +02:00
..
Cache	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
Config	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Configure	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Console	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
Controller	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
Core	Merge branch 'master' into 2.4	2013-08-04 19:26:55 +05:30
Error	Merge branch 'master' into 2.4	2013-07-07 12:22:12 +05:30
Event	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
I18n	remove undocumented code and uncessary in_array() checks + cleanup	2013-08-08 03:56:58 +02:00
Log	allow creating of missing tmp directories in debug (development) mode for cache and log to avoid unnecessary errors thrown - using 0775 for dirs and 0664 for files	2013-08-07 13:24:45 +02:00
Model	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
Network	Merge pull request #1503 from tigrang/cake-response-multi-header	2013-08-11 12:19:26 -07:00
Routing	Merge pull request #1228 from jrbasso/2.4-router-parse	2013-08-06 18:57:37 -07:00
Test	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
TestSuite	Merge pull request #1475 from cakephp/feature/2.4-mock-app-model	2013-08-05 00:22:53 -07:00
Utility	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
View	Merge branch 'master' into 2.4	2013-08-11 23:31:10 +02:00
basics.php	Merge branch 'master' into 2.4	2013-07-07 12:22:12 +05:30
bootstrap.php	Renaming base url config keys and methods for better uniformity.	2013-08-01 00:44:36 +05:30
LICENSE.txt	Formatted CSF address	2013-02-08 21:08:15 +09:00
VERSION.txt	Update version number to 2.3.8	2013-07-17 22:15:15 -04:00