Files
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Vincent Breitmoser c871891f49 Merge remote-tracking branch 'origin/master'
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
2014-09-24 01:42:17 +02:00
..
2014-09-20 18:12:13 +02:00
2014-09-22 00:10:55 +02:00
2014-09-07 15:30:32 +02:00
2014-09-24 00:02:00 +02:00
2014-09-21 18:10:51 +02:00
2014-09-21 18:10:51 +02:00
2014-09-21 22:56:16 +02:00
2014-09-20 18:12:13 +02:00