ADmad d9ca148499 Merge branch 'master' into 2.5 ... Conflicts: CONTRIBUTING.md lib/Cake/Model/Model.php lib/Cake/VERSION.txt		2013-10-30 02:34:09 +05:30
..
css	Added display of CakePHP version to the default layout	2013-10-16 02:07:59 +02:00
files	Adding empty files to directories that were previously omitted.	2009-09-20 18:03:42 -04:00
img	Adding testsuite icons to the repo, so they are local assets instead of remote ones.	2011-05-22 09:15:04 -04:00
js	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
.htaccess	use a simpler rewrite rule	2013-07-13 16:18:48 +00:00
favicon.ico	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00:00
index.php	Sync skel and app directories.	2013-10-22 22:18:59 -04:00
test.php	include calls without parentheses	2013-10-16 01:40:45 +02:00