cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,764 Commits 1 Branch 0 Tags
5d2c81d715cf1fd9ff23a8d1aa43fcfb58f7d099
Commit Graph

3 Commits

Author SHA1 Message Date
Vincent Breitmoser
5d2c81d715 make linked identity list homogeneous 2015-03-05 13:13:43 +01:00
Vincent Breitmoser
7b3bc4ca98 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-03-05 12:10:51 +01:00
Vincent Breitmoser
1f324be243 do a TON of UI work 2015-03-05 01:58:36 +01:00