Merge remote-tracking branch 'origin/exception'

Conflicts:
	composer.json
	src/BeSimple/SoapBundle/composer.json
This commit is contained in:
Francis Besset
2013-11-15 10:37:55 +01:00
8 changed files with 188 additions and 9 deletions

View File

@ -25,8 +25,9 @@
"besimple/soap-common": "0.2.*",
"besimple/soap-wsdl": "0.2.*",
"ass/xmlsecurity": "~1.0",
"zendframework/zend-mime": "2.1.*",
"symfony/framework-bundle": "~2.0"
"symfony/framework-bundle": "~2.0",
"symfony/twig-bundle": "~2.0",
"zendframework/zend-mime": "2.1.*"
},
"suggest": {
"besimple/soap-client": "0.2.*",