1
0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 23:12:06 -05:00
Dominik Schürmann e8780b4410 Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
..
2014-06-09 21:55:32 +02:00
2014-12-04 19:07:38 +01:00