Merge branch 'master' into Versuch_Produktinformation

Browse Source

# Conflicts:
#	OMDSServiceDefinition/src/main/resources/wsdl/omds3ServiceTypes.xsd
#	OMDSServiceDefinition/src/main/resources/wsdl/omds3Services.wsdl

...

This commit is contained in:

Jens Bühring

2018-06-11 12:27:16 +02:00

parent 59a78d93e7 8c54dc8fe5

commit 47b6d05900

4 changed files with 4902 additions and 4284 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1799

OMDSServiceDefinition/src/main/resources/wsdl/omds3Services.wsdl

File diff suppressed because it is too large Load Diff