Commit graph

11 commits

Author SHA1 Message Date
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
mark_story
f963e378b5 Fix coding standards errors. 2012-07-26 21:22:50 -04:00
Graham Weldon
9539023b82 Fixed coding standard errors in schema.php in app/ 2012-05-01 09:32:10 +10:00
Graham Weldon
d40a8a90a8 Fixing coding standards in i18n schema in app/ 2012-05-01 09:30:22 +10:00
Graham Weldon
23d8e636b9 Fixed coding errors in db_acl.php in app/ 2012-05-01 09:28:02 +10:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Ceeram
b380b5efb9 Add back missing .sql files, related to pull request 132 on docs repo 2011-11-17 13:00:54 +01:00
Heath Nail
ce4acda25b Incresing sync between app and skel directories. 2011-10-14 15:06:36 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Jose Lorenzo Rodriguez
900dfef2f7 Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30