cakephp2-php8/cake/libs/model
predominant 52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
..
behaviors Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
datasources Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
app_model.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
cake_schema.php Fix protected call for _build on CakeSchema, and associated references. 2010-04-09 20:41:28 +10:00
connection_manager.php Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
db_acl.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
model.php Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
model_behavior.php Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00