Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3791
Conflicts:
org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/util/.ratings
org.fortiss.af3.task/src/org/fortiss/af3/task/util/.ratings
Signed-off-by:
Simon Barner <barner@fortiss.org>
Please register or sign in to comment