]> rtime.felk.cvut.cz Git - edu/osp-wiki.git/commitdiff
Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Thu, 6 Aug 2020 09:15:04 +0000 (11:15 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Thu, 6 Aug 2020 09:15:04 +0000 (11:15 +0200)

Trivial merge