| commit | 8033e76e6a6ac3d193a8ed90982ecdcbaaeff282 | |
| author | Paul <paul@claws-mail.org> | |
| Wed, 17 Mar 2021 15:14:58 +0000 (17 15:14 +0000) | ||
| committer | Paul <paul@claws-mail.org> | |
| Wed, 17 Mar 2021 15:14:58 +0000 (17 15:14 +0000) | ||
| tree | b542f44b08c3f8b78a8569ebac4fe81a21aae615 | treesnapshot (tar.gz zip) |
| parent | 8c1a4c98087d84292d4b617af3a9306f6bb2a4b7 | commitdiff |
fix conflict
| AUTHORS | diffblobblamehistory |