Robert Korulczyk 1a70f60332 Merge master into doc-fixes ...

Conflicts:
	framework/web/AssetManager.php

2016-11-13 15:35:18 +01:00

..

controllers

Some phpdoc fixes from scrutinizer.

2016-11-12 22:11:30 +01:00

runtime

psr-4 move

2014-01-10 21:41:43 -05:00

Application.php

Fixes #12055: Changed boolean to bool and integer to int in phpdoc

2016-11-07 02:51:39 +03:00

Controller.php

Merge master into doc-fixes

2016-11-13 15:35:18 +01:00

ErrorHandler.php

coding style fixes

2016-05-26 11:19:32 +02:00

Exception.php

Reformat code te be PSR-2 compatible

2014-03-16 10:46:21 +06:00

Markdown.php

Fix errors reported by apidoc extension. (#12986)

2016-11-13 14:51:21 +01:00

Request.php

WIP #10840: rename key 'alias' to '_aliases'

2016-02-27 23:26:34 +01:00

Response.php

psr-4 move

2014-01-10 21:41:43 -05:00