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

Merge branch '3672' of https://git.fortiss.org/af3/kernel.git into 3672


Conflicts:
	org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/.ratings


Signed-off-by: default avatarAlexander Diewald <diewald@fortiss.org>
parents 2d67ed85 b2997c19
No related branches found
No related tags found
Loading
This commit is part of merge request !69. Comments created here will be created in the context of that merge request.
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