moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-04 16:25:05 -05:00
Code Issues Releases Wiki Activity
e457d4c909
open-keychain/OpenKeychain
History
Vincent Breitmoser e457d4c909 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml
2014-09-15 14:00:17 +02:00
..
src/main Merge remote-tracking branch 'origin/master' 2014-09-15 14:00:17 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Add safeslinger to build 2014-09-04 11:30:36 +02:00