moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-11 11:35:07 -05:00
Code Issues Releases Wiki Activity
d63534d655
open-keychain/OpenKeychain/src/main
History
Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
2014-07-16 18:49:16 +02:00
..
assets remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
java Merge remote-tracking branch 'upstream/master' 2014-07-16 18:49:16 +02:00
res Merge remote-tracking branch 'upstream/master' 2014-07-16 18:49:16 +02:00
AndroidManifest.xml New first time screen 2014-07-16 09:49:37 +02:00