Merge branch 'nodiscc-improvements-misc' into master
commit91fb0c17b2c6d2b9dd9e1b52559ab9a7c0eea3ed
authorpyllyukko <pyllyukko@maimed.org>
Sat, 22 Aug 2020 18:49:31 +0000 (22 21:49 +0300)
committerpyllyukko <pyllyukko@maimed.org>
Sat, 22 Aug 2020 18:49:31 +0000 (22 21:49 +0300)
tree1fcd10fd40ccba4e21005729c059a5a095eb0979
parent2929c685d443e48f02c228af92aa43b1b0f33c72
parentc6d157233918c61ccb54046e4851a5ca1dc1e649
Merge branch 'nodiscc-improvements-misc' into master