Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Jeremy Benoist
2016-07-20 12:02:02 +02:00
26 changed files with 149 additions and 64 deletions

3
.gitignore vendored
View File

@ -10,6 +10,9 @@
/var/sessions/*
!var/sessions/.gitkeep
!var/SymfonyRequirements.php
/bin/*
!/bin/console
!/bin/symfony_requirements
# Parameters
/app/config/parameters.yml