Merge remote-tracking branch 'origin/master'

This commit is contained in:
Johannes Theiner 2018-06-12 15:21:09 +02:00
commit 10c49e3a77

View File

@ -1,4 +1,4 @@
[<img src="https://teamcity.torchwood.joethei.de/app/rest/builds/buildType:(id:Studium_Java2)/statusIcon">](https://teamcity.torchwood.joethei.de/viewType.html?buildTypeId=Studium_Java2&guest=1)
<img src="https://teamcity.torchwood.joethei.de/app/rest/builds/buildType:(id:Studium_Java2)/statusIcon">
<img src="https://sonarqube.torchwood.joethei.de/api/project_badges/measure?project=Java_2&metric=alert_status">
<img src="https://sonarqube.torchwood.joethei.de/api/project_badges/measure?project=Java_2&metric=vulnerabilities">