Commit 5449d03

committed

Merge branch 'master' into merge-upstream

# Conflicts: # lib/request/sfWebRequest.class.php # lib/util/sfFinder.class.php # lib/validator/sfValidatorBoolean.class.php

2 parents a27016c + de1836e commit 5449d03Copy full SHA for 5449d03

2 files changed

+243

-155

lines changed

+243

-155

lines changed

Comments

(0)