]> rtime.felk.cvut.cz Git - hubacji1/psp.git/commitdiff
projects / hubacji1 / psp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9154160 215dc15)
Merge branch 'hotfix/0.4.2' master
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Thu, 8 Apr 2021 08:21:15 +0000 (10:21 +0200)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Thu, 8 Apr 2021 08:21:15 +0000 (10:21 +0200)

Trivial merge