Merge branch 'master' into stable
commitc6a18ef41cc579a42af4ec2dfbeac8d3fcd2cbbe
authorCyril Brulebois <ckb@riseup.net>
Tue, 12 Feb 2019 13:37:18 +0000 (12 14:37 +0100)
committerCyril Brulebois <ckb@riseup.net>
Tue, 12 Feb 2019 13:37:18 +0000 (12 14:37 +0100)
tree625950bb4ededc89f698fcb49f5e90d2d394991a
parent64ab5bd00f561332cf70a3a91de8eb2cb21f2282
parentf17948374825824c3c5821ef671b9ffea151ba58
Merge branch 'master' into stable