Merge branch 'master' into test
authorMartin Kudlacek <kudlacek@unipi.technology>
Tue, 11 Feb 2020 15:41:11 +0000 (16:41 +0100)
committerMartin Kudlacek <kudlacek@unipi.technology>
Tue, 11 Feb 2020 15:41:11 +0000 (16:41 +0100)
commit59e36e4e0c2d1f9a7a5fe10aabb3ed9af74bf163
treeee2e526645419782393470a8f483d84035728bce
parentca01c166ef02f847fe49687278d4ffbe1caa382c
parent329d0e17c45b4bb4c74cf4ecad1676a9ac9a3dda
Merge branch 'master' into test