Skip to content
Commit 08706104 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'ttf-022-maven' into ttf-022 

# Conflicts (resolved):
#	plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/scoping/TDLScopeProvider.java
#	plugins/org.etsi.mts.tdl.helper/META-INF/MANIFEST.MF
#	plugins/org.etsi.mts.tdl.openapi2tdl.next/META-INF/MANIFEST.MF
parents f892b9c3 6e4b51ac
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment