Added framework config option: trusted_hosts
updated VENDORS for 2.2.9
updated VENDORS for 2.2.10
Backport issue 426 / PR 429 to branch 2.2
bug #611 Backport issue 426 / PR 429 to branch 2.2 (jdespatis)

This PR was merged into the 2.2 branch.

Discussion
----------

Backport issue 426 / PR 429 to branch 2.2

Yaml config files into app/config are not valid

This issue has already been reported one year ago with issue #426, and has been fixed thanks to PR #429
However, it seems that this PR has been merged into branch 2.1, and not backported into master

Therefore this bug still exists in master, 2.2, 2.3 and 2.4

Here is a PR to merge into branch 2.2 (and it would need a backport into master, 2.3 and 2.4 ?, and maybe a new tag for each)

Commits
-------

ead925b Backport issue 426 / PR 429 to branch 2.2
Merge branch '2.2' into 2.3

* 2.2:
  Backport issue 426 / PR 429 to branch 2.2
  updated VENDORS for 2.2.10
  updated VENDORS for 2.2.9

Conflicts:
	app/config/config.yml
	composer.lock
Merge branch '2.3'

* 2.3:
  Backport issue 426 / PR 429 to branch 2.2
  updated VENDORS for 2.2.10
  updated VENDORS for 2.2.9

Conflicts:
	app/config/config_dev.yml
Fixed the path to config.php in the readme file
minor #605 Fixed the path to config.php in the readme file (jaspernbrouwer)

This PR was squashed before being merged into the master branch (closes #605).

Discussion
----------

Fixed the path to config.php in the readme file

I think the title says it all.

Commits
-------

415f7d8 Fixed the path to config.php in the readme file
feature #585 Added framework config option: trusted_hosts (pulzarraider)

This PR was merged into the master branch.

Discussion
----------

Added framework config option: trusted_hosts

Commits
-------

01b6ed3 Added framework config option: trusted_hosts