Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

This commit is contained in:
Jose Lorenzo Rodriguez 2011-10-05 12:16:58 -04:30
commit 0a6fae00fb

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
/app/Config /app/Config
/app/tmp /app/tmp
/lib/Cake/Console/Templates/skel/tmp/
/plugins /plugins
/vendors /vendors
.DS_Store .DS_Store