]> rtime.felk.cvut.cz Git - hubacji1/oneflow.git/commitdiff
projects / hubacji1 / oneflow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ea2527 1438f39)
Merge branch 'vetvicka'
authorJaroslav Klapálek <klapajar@fel.cvut.cz>
Thu, 28 Jun 2018 09:36:41 +0000 (11:36 +0200)
committerJaroslav Klapálek <klapajar@fel.cvut.cz>
Thu, 28 Jun 2018 09:36:41 +0000 (11:36 +0200)

Trivial merge