updated composer.json
fixed typo
Fix deprecated function bind
merged branch agiuliano/master (PR #547)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #547).

Discussion
----------

Fix deprecated function

In AcmeDemoController/contactAction there was the deprecated function $form->bind() instead of $form->submit()

Commits
-------

b83f3ba Fix deprecated function bind
updated doc links
merged branch lsmith77/patch-2 (PR #551)

This PR was merged into the 2.2 branch.

Discussion
----------

updated doc links

Commits
-------

465686c updated doc links
Remove +x mode on file
merged branch jdespatis/master (PR #545)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #545).

Discussion
----------

Remove +x mode on file app/logs/.gitkeep

Mode on app/cache/.gitkeep is 100644, same mode should be applied to app/logs/.gitkeep

Further more, afaik, .gitkeep doesn't aim to be a shell script

Commits
-------

89a18a4 Remove +x mode on file
Merge branch '2.1' into 2.2

* 2.1:
  Remove +x mode on file
  updated VENDORS for 2.1.10

Conflicts:
	composer.lock
Merge branch '2.2' into 2.3

* 2.2:
  Remove +x mode on file
  updated doc links
  updated VENDORS for 2.1.10

Conflicts:
	README.md
updated versions in the README file
Fixed accidentally removed status code in app/check.php
merged branch maxromanovsky/app-config-status-code-fix (PR #553)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #553).

Discussion
----------

Fixed accidentally removed status code in app/check.php

Commits
-------

bbf5680 Fixed accidentally removed status code in app/check.php
updated VENDORS for 2.3.0
Remove .htaccess files except from web root
Remove AcmeDemoBundle bundle
parameters.yml renamed to parameters.dist.yml
Generic html twig template modified
Remove check and basic setup
remove trailing comma from composer.json