Commit 21e6137adc8e98cb3cf06dc26ba96c3d5a97729f
Merge branch 'AtomPub_ResponseObjects' into atomPub
Conflicts: webservice/classes/soap/IPReflectionClass.class.php webservice/classes/soap/IPReflectionCommentParser.class.php webservice/classes/soap/IPReflectionMethod.class.php webservice/classes/soap/IPReflectionProperty.class.php webservice/classes/soap/WSDLException.class.php webservice/classes/soap/WSDLStruct.class.php webservice/classes/soap/WSException.class.php webservice/classes/soap/WSHelper.class.php webservice/classes/soap/common.php webservice/classes/soap/templates/docclass.xsl webservice/classes/soap/templates/str.replace.function.xsl webservice/tests/annotations.php
Showing
0 changed files