Merge branch 'master' into cguindon/master/fossdem21
authorPieter De Praetere <pieter.de.praetere@helptux.be>
Fri, 29 Jan 2021 22:05:02 +0000 (23:05 +0100)
committerGitHub <noreply@github.com>
Fri, 29 Jan 2021 22:05:02 +0000 (23:05 +0100)
commit3e575bbde73e91fe13abc11a03ed27a4ac1749d5
tree72d56df8f91f734eee4a79b4536a51fa613a0582
parent147d81216ddd5b5b2764c553f2e045eb8be09445
parente5e063c45d6b7210b2e458fef7504afadb51744f
Merge branch 'master' into cguindon/master/fossdem21
.gitmodules