Skip to content
Snippets Groups Projects
Commit 926a9462 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge branch 'master' into 3482


Conflicts:
	org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
	org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings


Signed-off-by: default avatarAlexander Diewald <diewald@fortiss.org>
parents b02c8fcd f5c10378
No related branches found
No related tags found
1 merge request!473482
Showing
with 161 additions and 238 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment