Merge branch 'test'
authorMartin Kudlacek <kudlacek@unipi.technology>
Fri, 29 May 2020 07:27:09 +0000 (09:27 +0200)
committerMartin Kudlacek <kudlacek@unipi.technology>
Fri, 29 May 2020 07:27:09 +0000 (09:27 +0200)
commit21810fc614c2100416c4383af66cbf418dbc90a1
tree2082941d801d36afcc1aa4c216f1ea50f01b58aa
parent7c428c75bbe60de9e01dbb1ae0d44cb0caa18dec
parent0a0a21770b9d20cd222c14482df1bc6d0d7e61ae
Merge branch 'test'