Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2017-01-16 11:06:39 +01:00
commit 8e6c33c260
14 changed files with 288 additions and 64 deletions

View file

@ -80,6 +80,13 @@ class Config
*/
public $curl_params = [];
/**
* Disable URL rewriting.
*
* @var bool
*/
public $uglyUrls = false;
/**
* YAML config file path.
*