40703fe961
Conflicts: OpenKeychain/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
src/test | ||
build.gradle |
40703fe961
Conflicts: OpenKeychain/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
src/test | ||
build.gradle |