mark_story a99d2ea821 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 ... Conflicts: cake/libs/model/model.php		2009-10-05 21:02:41 -04:00
..
behaviors	Updating doc blocks to improve parsing in the API.	2009-10-05 21:01:31 -04:00
datasources	Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2	2009-09-30 14:26:38 -04:00
app_model.php	changing tabs for spaces in comment block indentation	2008-10-30 17:30:26 +00:00
behavior.php	Reversing change from [a37fc0d455e373b30a73f11687885572c6e4b90d]. As the additional & causes errors in PHP <= 5.2	2009-09-29 10:05:03 -04:00
connection_manager.php	Adding tests for ConnectionManager, and fixing a missing return value for ConnectionManager::loadDataSource().	2009-09-24 16:26:56 -04:00
db_acl.php	fixes #5926, table prefix on acl tables when overriding constructor	2009-01-14 17:43:46 +00:00
model.php	Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2	2009-10-05 21:02:41 -04:00
schema.php	Backporting bugfix for #22 from 1.3-console to 1.2. Adds schema shell test cases, fixes for schema object references, i18n of schema schell output strings.	2009-09-07 12:24:38 -04:00