]> rtime.felk.cvut.cz Git - hubacji1/iamcar.git/commitdiff
Merge branch 'feature/measurement'
authorJiri Hubacek <hubacji1@fel.cvut.cz>
Tue, 9 Oct 2018 13:48:52 +0000 (15:48 +0200)
committerJiri Hubacek <hubacji1@fel.cvut.cz>
Tue, 9 Oct 2018 13:48:52 +0000 (15:48 +0200)

Trivial merge