mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-18 21:32:16 -05:00
abd1211613
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java |
||
---|---|---|
.. | ||
android/support/v4/widget | ||
com/haibison/android/lockpattern | ||
org |