cakephp2-php8/cake/console/templates
Mark Story 09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
..
default Fixing output of 'Actions' in bake templates. Now outputs a __() call. 2010-01-13 00:14:57 -05:00
skel Merge remote branch 'origin/1.2' into merger 2010-01-15 11:51:58 -05:00