Merge branch '2.x' of github.com:cakephp/cakephp into 2.x

This commit is contained in:
mark_story 2017-04-28 21:50:20 -04:00
commit cfcbd6ea31

View file

@ -40,7 +40,7 @@ class PagesController extends AppController {
/** /**
* Displays a view * Displays a view
* *
* @return \Cake\Network\Response|null * @return CakeResponse|null
* @throws ForbiddenException When a directory traversal attempt. * @throws ForbiddenException When a directory traversal attempt.
* @throws NotFoundException When the view file could not be found * @throws NotFoundException When the view file could not be found
* or MissingViewException in debug mode. * or MissingViewException in debug mode.