Vincent Breitmoser
5f20b8de1a
Merge branch 'new-edit'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/res/values/strings.xml
2014-06-18 21:09:04 +02:00
..
2014-05-07 03:07:24 +02:00
2014-06-18 00:03:06 +02:00
2014-04-17 14:42:24 +02:00
2014-06-18 00:03:06 +02:00
2014-06-18 00:03:06 +02:00
2014-06-18 00:03:06 +02:00
2014-04-06 12:57:42 +02:00
2014-06-18 00:03:06 +02:00
2014-04-22 08:15:55 +02:00
2014-06-06 22:46:39 +02:00
2014-05-14 18:01:40 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-06-18 21:09:04 +02:00
2014-05-31 20:49:56 +02:00
2014-05-31 20:49:56 +02:00
2014-06-18 00:03:06 +02:00
2014-05-07 09:13:32 +02:00
2014-06-10 16:24:04 +02:00
2014-05-07 09:13:32 +02:00
2014-06-10 16:24:04 +02:00
2014-06-10 16:24:04 +02:00
2014-06-10 16:24:04 +02:00
2014-05-07 09:13:32 +02:00
2014-04-06 12:57:42 +02:00
2014-06-10 16:24:04 +02:00
2014-06-10 16:24:04 +02:00
2014-06-10 16:24:04 +02:00
2014-06-10 16:24:04 +02:00
2014-05-07 09:13:32 +02:00
2014-06-10 16:24:04 +02:00
2014-05-07 03:55:06 +02:00
2014-05-07 09:13:32 +02:00
2014-06-05 23:22:21 +02:00