mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-08-13 15:53:53 -04:00
Merge remote-tracking branch 'upstream/development' into development
Conflicts: .gitmodules
This commit is contained in:
commit
3dda761791