Skip to content

Commit

Permalink
Merge branch 'simplify-cake-time' into 2.3
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/Cake/Utility/CakeTime.php
  • Loading branch information
@markstory
markstory committed Sep 14, 2012
2 parents 51e0715 + 95b895b commit ec54fa5
Showing 1 changed file with 129 additions and 128 deletions.

0 comments on commit ec54fa5

Please sign in to comment.