Merge branch 'develop' into feature/stream
Conflicts: composer.lock
This commit is contained in:
commit
8e6c33c260
14 changed files with 288 additions and 64 deletions
|
@ -80,6 +80,13 @@ class Config
|
|||
*/
|
||||
public $curl_params = [];
|
||||
|
||||
/**
|
||||
* Disable URL rewriting.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
public $uglyUrls = false;
|
||||
|
||||
/**
|
||||
* YAML config file path.
|
||||
*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue