]> mj.ucw.cz Git - nsc-5.git/commitdiff
Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/nsc
authorroot <root@ucw.cz>
Wed, 30 Jan 2019 13:48:37 +0000 (14:48 +0100)
committerroot <root@ucw.cz>
Wed, 30 Jan 2019 13:48:37 +0000 (14:48 +0100)

Trivial merge