Skip to content
  • Johannes Eder's avatar
    Merge branch 'master' into 4022 · 7c7b092f
    Johannes Eder authored
    
    
    Conflicts:
    	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
    	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectPlatformArchitecture.java
    	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/targetdef/constraint/pattern/.ratings
    	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/targetdef/constraint/pattern/SafetyPatternFXController.java
    
    
    Signed-off-by: default avatarJohannes Eder <eder@fortiss.org>
    7c7b092f