moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 23:12:06 -05:00
Code Issues Releases Wiki Activity
open-keychain/OpenKeychain/src
History
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
..
main
Merge remote-tracking branch 'origin/development' into linked-identities
2015-03-10 04:56:51 +01:00