mirror of
https://github.com/moparisthebest/open-keychain
synced 2025-03-02 18:31:48 -05:00

Merge branch 'master' into apg_service Conflicts: src/org/thialfihar/android/apg/Apg.java src/org/thialfihar/android/apg/Preferences.java
Description
Languages
Java
94.2%
Public Key
3.7%
eC
0.8%
Gradle
0.5%
Python
0.4%
Other
0.4%