updated VENDORS for 2.2.2
updated VENDORS for 2.2.3
updated VENDORS for 2.2.4
updated demo code to use the non-deprecated features of Twig
updated VENDORS for 2.2.5
merged branch fabpot/twig-deprecated-features (PR #580)

This PR was merged into the 2.2 branch.

Discussion
----------

Twig deprecated features

see symfony/symfony#8675

Commits
-------

35a5826 updated demo code to use the non-deprecated features of Twig
updated VENDORS for 2.2.6
updated VENDORS for 2.3.4
fix doctrine-common dependency for 2.3 version
merged branch eventhorizonpl/fix_doctrine_common_dependency (PR #591)

This PR was merged into the 2.3 branch.

Discussion
----------

Fix doctrine common dependency

After release of Doctrine 2.4 the following versions was installed:
doctrine-orm: 2.3.x
doctrine-dbal: 2.3.x
doctrine-common: 2.4.x

We want the same version of doctrine components. I suggest blocking it on 2.3 for now.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

df4a16e fix doctrine-common dependency for 2.3 version
Revert "merged branch eventhorizonpl/fix_doctrine_common_dependency (PR #591)"

This reverts commit 8198f951d05302ec97c60e8679a24d53d3cb62c2, reversing
changes made to 23706c428be96ce5cb7d728c7cb9f1e904e01a80.
updated VENDORS for 2.2.8
Merge branch '2.2' into 2.3

* 2.2:
  updated VENDORS for 2.2.8
  updated VENDORS for 2.2.6
  updated VENDORS for 2.2.5
  updated demo code to use the non-deprecated features of Twig
  updated VENDORS for 2.2.4
  updated VENDORS for 2.2.3
  updated VENDORS for 2.2.2

Conflicts:
	composer.json
	composer.lock
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
Allow Doctrine 2.4 to be installed
make htaccess deny in src and app work with apache 2.4