Skip to content
  • Ashmi Banerjee's avatar
    Merge branch '3418' of https://git.fortiss.org/af3/af3.git into 3418 · 5f1be414
    Ashmi Banerjee authored
    Conflicts:
    	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/.ratings
    	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/.ratings
    	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/.ratings
    	org.fortiss.af3.mira/model/.ratings
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/.ratings
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/prototype/.ratings
    5f1be414