cakephp2-php8/cake
José Lorenzo Rodríguez 2e49a96634 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding file omitted from [30cb38eb93]
  Adding tests for deletion of multiple habtm associations.  Reverting changes made in [15518b8c9a] that caused incorrect removal of links when deleting records.  Fixes #247
2010-01-29 15:31:40 -04:30
..
config Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
console Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
libs Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-01-29 15:31:40 -04:30
tests Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-29 11:56:09 -05:00
basics.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
bootstrap.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
dispatcher.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers. to 1.3.0-beta 2010-01-16 20:38:08 -05:00