Dominik Schürmann 30711c3fe7 Merge pull request #1174 from Jesperbk/development ... Fixed symmetric encryption crash		2015-03-23 13:01:10 +01:00
..
src/main	Merge pull request #1174 from Jesperbk/development	2015-03-23 13:01:10 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2015-03-23 01:11:17 +01:00