mark_story 63769ae4a6 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/VERSION.txt		2015-02-26 12:50:35 -05:00
..
BakeTask.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
CommandTask.php	Fix remaining doc block errors in Console/	2014-05-27 23:34:53 -04:00
ControllerTask.php	Use (int) cast instead of intval() function for performance reasons and to unify it.	2014-09-10 15:52:57 +02:00
DbConfigTask.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ExtractTask.php	Ignore LC_TIME category when extracting messages.	2015-02-22 22:39:38 -05:00
FixtureTask.php	App::uses and usage replacements for String => CakeText.	2015-01-05 01:00:57 +01:00
ModelTask.php	Clarify question.	2014-12-23 11:18:32 -05:00
PluginTask.php	Fix: "bake plugin" generates incorrect directory for View/Layouts	2015-02-04 15:47:01 +07:00
ProjectTask.php	App::uses and usage replacements for String => CakeText.	2015-01-05 01:00:57 +01:00
TemplateTask.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
TestTask.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ViewTask.php	Fix views overwrite warning text	2014-10-21 14:39:09 -04:00