Merge branch 'nodiscc-make-checkcommonwithupstream'
commit122f17cbe8d008b645af9e7fc1f370c2b9a510f5
authorpyllyukko <pyllyukko@maimed.org>
Thu, 14 Jan 2021 21:26:20 +0000 (14 23:26 +0200)
committerpyllyukko <pyllyukko@maimed.org>
Thu, 14 Jan 2021 21:26:20 +0000 (14 23:26 +0200)
tree349d15a88fa9c7cbcc189611813ed374d8627a6b
parent310ec83913927a4f273012d32994b9c9fa8a5906
parent784367735272f7e567b64d3edf981e6d221e8908
Merge branch 'nodiscc-make-checkcommonwithupstream'