Skip to content
Snippets Groups Projects
Commit 6fd19eee authored by Simon Barner's avatar Simon Barner
Browse files

Merge 'master' of https://git.fortiss.org/af3/kernel.git into 3921


All GREEN

Conflicts:
	org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
	org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings
	org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeViewer.java


Signed-off-by: default avatarSimon Barner <barner@fortiss.org>
parents 3e5a4445 fcf4a674
No related branches found
No related tags found
1 merge request!923921
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