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

3 Commits

Author SHA1 Message Date
Vincent Breitmoser
b25371fc1b support github resource (re) 2015-03-24 02:30:39 +01:00
Vincent Breitmoser
531697ffe7 Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
 2015-03-10 04:56:51 +01:00
Vincent Breitmoser
92b8d874ed affirmation -> linked identity 2015-01-15 16:59:11 +01:00