Merge branch 'test'
authorMartin Kudlacek <kudlacek@unipi.technology>
Fri, 5 Jun 2020 14:43:34 +0000 (16:43 +0200)
committerMartin Kudlacek <kudlacek@unipi.technology>
Fri, 5 Jun 2020 14:43:34 +0000 (16:43 +0200)
commit2680ad9c1186993d72ca192f7c8888e2730d8fa5
treeeca82a9d05ec6d7a47c90e1ff9577b3a2ac0e82a
parent21810fc614c2100416c4383af66cbf418dbc90a1
parent5439074f2742097a07eb19b525f716a1a2f8396e
Merge branch 'test'