cakephp2-php8/lib/Cake/Model/Datasource
Jose Lorenzo Rodriguez d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
..
Database Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00
Session Fix incorrect expiry of sessions. 2012-08-02 21:03:53 -04:00
CakeSession.php Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00
DataSource.php Merge branch 'master' into 2.3 2012-08-20 16:20:27 -04:00
DboSource.php Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00