Merge branch 'nodiscc-rm-cas-sh'
commit9d18038056f27850356389edef7ea8e71ed634a1
authorpyllyukko <pyllyukko@maimed.org>
Fri, 23 Jul 2021 17:55:56 +0000 (23 20:55 +0300)
committerpyllyukko <pyllyukko@maimed.org>
Fri, 23 Jul 2021 17:55:56 +0000 (23 20:55 +0300)
treea402d2f38d91bdac53c6856d9f29ae4e1b9714a1
parentc2982814ed989f0bac1f30c1e824f9cf1069abe1
parent526d4199ecdb8ce57ae91464a30f1c4980224169
Merge branch 'nodiscc-rm-cas-sh'