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

Merge remote-tracking branch 'origin/master' into 3672


Conflicts:
	org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings


Signed-off-by: default avatarAlexander Diewald <diewald@fortiss.org>
parents 1cdb7e7e c88ea31f
No related branches found
No related tags found
1 merge request!7Dev Objectives: Fix layout in toolbar
Showing
with 100 additions and 94 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