]> rtime.felk.cvut.cz Git - testing.git/commitdiff
Merge branch 'some'
authorJiri Hubacek <hubacji1@fel.cvut.cz>
Fri, 3 Nov 2017 12:22:17 +0000 (13:22 +0100)
committerJiri Hubacek <hubacji1@fel.cvut.cz>
Fri, 3 Nov 2017 12:22:17 +0000 (13:22 +0100)

Trivial merge