Mark Story d88da3d579 Merge branch '1.3' into 2.0 ... Conflicts: cake/libs/configure.php cake/libs/model/connection_manager.php cake/libs/model/model.php cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php cake/tests/cases/libs/view/helpers/text.test.php		2010-09-06 16:53:04 -04:00
..
libs	Merge branch '1.3' into 2.0	2010-09-06 16:53:04 -04:00
templates	Changing gif to png, so baked apps have the correct icon. Fixes #1081	2010-09-06 01:38:31 -04:00
cake	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.bat	Applying patch from 'Mark Mitchell' to fix auto exiting of cake.bat. Fixes #992	2010-08-14 18:54:12 -04:00
cake.php	Fixing ShellDispatcher tests and making ShellDispatcher/Shell use TaskCollection to loadTasks.	2010-08-10 23:18:41 -04:00
error.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00