diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
| commit | 1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc (patch) | |
| tree | add2f0d85813f9ece1be3c926b4ae8f221d7cf47 /OpenKeychain/src/main/res/raw-sl | |
| parent | d6d678dae3ed5d794a9aa5e289197d264f6a7ff9 (diff) | |
| parent | c442d3bd0d3bac96614d3d5c0e833a42cab4706e (diff) | |
| download | open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.gz open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.bz2 open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.zip | |
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
OpenKeychain/src/main/res/menu/decrypt_menu.xml
Diffstat (limited to 'OpenKeychain/src/main/res/raw-sl')
0 files changed, 0 insertions, 0 deletions