cakephp2-php8/cake/libs/model/behaviors
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
..
acl.php Adding changes missed in the merge. 2010-08-15 23:10:29 -04:00
containable.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
translate.php Removing PHP5 and all its uses. 2010-07-05 22:19:22 -04:00
tree.php Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00