Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/open-keychain/openpgp-api…
Browse files Browse the repository at this point in the history 
…-lib

Conflicts:
	src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
  • Loading branch information
Dominik Schürmann committed Apr 10, 2015
2 parents 2188499 + 97cf30e commit 70259ab
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 70259ab

Please sign in to comment.