Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
webeweb committed Dec 22, 2017
2 parents 90ba052 + ebf57e0 commit 2da5da0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Tests/Fixtures/App/config/config_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ parameters:
locale: en

framework:
# assets: ~
# csrf_protection: true
default_locale: %locale%
form: true
Expand Down

0 comments on commit 2da5da0

Please sign in to comment.