merge changes from KeePass 2.48 with support for KDBX 4.1 and slightly improved merging behavior with respect to custom icons, closes https://github.com/PhilippC/keepass2android/issues/1670

This commit is contained in:
Philipp Crocoll
2021-05-14 08:01:34 +02:00
parent f5ee9e3955
commit 562a80132a
24 changed files with 3581 additions and 2414 deletions

File diff suppressed because it is too large Load Diff