euromark a947958dc9 Fix cs		2015-01-04 02:27:40 +01:00
..
Cache	Merge branch 'master' into 2.6	2014-12-06 21:28:59 -05:00
Config	Updated the default Cake routes to include a defaultRoute true flag to allow differentiation	2014-05-29 00:55:51 -04:00
Configure	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Console	Fix Extract task to correctly extract messages with context	2014-12-25 14:28:44 +02:00
Controller	Merge pull request #5470 from cakephp/2.7-session	2014-12-26 12:22:20 -05:00
Core	Backport of 3.0 Configure corrections.	2015-01-04 01:57:06 +01:00
Error	Remove trailing whitespace.	2014-12-14 18:05:20 -05:00
Event	Add @trigger doc blocks of methods triggering CakeEvent	2014-11-30 14:45:40 -07:00
I18n	Allow apps to overwrite translation domains from third party plugins.	2014-12-23 13:09:53 +01:00
Log	Consolidate with conditions sniff.	2014-12-09 03:17:35 +01:00
Model	Merge branch 'master' into 2.7	2015-01-03 14:34:55 -05:00
Network	Merge branch '2.6' into 2.7	2014-12-17 21:46:54 -05:00
Routing	Don't set content-length when serving assets.	2014-12-29 21:07:46 -05:00
Test	Fix cs	2015-01-04 02:27:40 +01:00
TestSuite	Merge branch 'master' into 2.7	2015-01-03 14:34:55 -05:00
Utility	Merge branch 'master' into 2.6	2014-12-17 21:38:32 -05:00
View	Merge branch 'master' into 2.7	2015-01-03 14:34:55 -05:00
basics.php	Merge branch 'master' into 2.6	2014-11-07 15:13:46 -05:00
bootstrap.php	Fix file_map being regenerated on every request.	2014-11-22 12:21:28 -05:00
LICENSE.txt	Formatted CSF address	2013-02-08 21:08:15 +09:00
VERSION.txt	Update version number to 2.6.0	2014-12-23 11:26:27 -05:00