From: Jiri Vlasak <hubacji1@fel.cvut.cz>
Date: Tue, 10 Sep 2019 16:05:41 +0000 (+0200)
Subject: Merge branch 'feature/new-json-scenario-format'
X-Git-Tag: v0.7.0~1
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/hubacji1/iamcar.git/commitdiff_plain/ee6b0f6e6374aca2a12964a08ef418f23b3eb40f

Merge branch 'feature/new-json-scenario-format'
---

ee6b0f6e6374aca2a12964a08ef418f23b3eb40f