From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Thu, 6 Aug 2020 09:15:04 +0000 (+0200)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/678dc5a95fbc167345b1c2e41d2e3ab5a3aaabeb

Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
---

678dc5a95fbc167345b1c2e41d2e3ab5a3aaabeb