Cadoles/CaptchaBundle
21
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	DependencyInjection/Configuration.php
This commit is contained in:
Ivan Lackovic
2014-03-19 16:27:04 +01:00
parent 34a84af209 f2e07fe6f2
commit 798f29e635
11 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DependencyInjection/Configuration.php
View File

@ -45,6 +45,7 @@ class Configuration implements ConfigurationInterface
->arrayNode('text_color')->prototype('scalar')->end()->end()
->arrayNode('background_color')->prototype('scalar')->end()->end()
->arrayNode('background_images')->prototype('scalar')->end()->end()
->scalarNode('disabled')->defaultValue(false)->end()
->scalarNode('ignore_all_effects')->defaultValue(false)->end()
->end()
;