82ee9d440b
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/layout/decrypt_list_entry.xml |
||
---|---|---|
.. | ||
android-icon-copier | ||
drawables | ||
screenshots | ||
get-material-icons.sh | ||
update-drawables.sh |