Merge branch 'gsoc2018/rest_api'
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 9 Aug 2018 21:57:14 +0000 (23:57 +0200)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 9 Aug 2018 21:57:14 +0000 (23:57 +0200)
commit08c410658159c0975ad87d7b7582259cd2ac6ee4
treef567c9020be2505f1c16a7249020e3e965ba7194
parent389f4939845a0cb00e5ce0d8ea3ab7fc0541fd1c
parent1ad7b69834fffc95e05354983009e435030c0861
Merge branch 'gsoc2018/rest_api'