cakephp2-php8/cake/libs/model
Mark Story 0c29fd0094 Merge remote branch 'origin/1.2' into 1.3
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
2010-03-27 11:48:49 -04:00
..
behaviors Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:37:50 -03:00
datasources Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-03-25 16:08:58 -04:30
app_model.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
cake_schema.php Merge remote branch 'origin/1.2' into 1.2-merger 2010-03-15 23:26:24 -04:00
connection_manager.php Moving call to _getConnectionObjects() inside class_exists check. Removes errors when creating a connection with no DATABASE_CONFIG class. 2010-03-05 21:37:28 -05:00
db_acl.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
model.php Merge remote branch 'origin/1.2' into 1.3 2010-03-27 11:48:49 -04:00
model_behavior.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00