mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-11 11:35:07 -05:00
1b7fbb1eeb
Merge branch 'master' into apg_service Conflicts: src/org/thialfihar/android/apg/Apg.java src/org/thialfihar/android/apg/Preferences.java |
||
---|---|---|
res | ||
src/org/thialfihar/android/apg | ||
AndroidManifest.xml | ||
default.properties |