Dominik Schürmann bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development ... Conflicts: OpenKeychain/src/main/res/values/strings.xml		2015-03-04 20:54:11 +01:00
..
src/main	Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development	2015-03-04 20:54:11 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Update patternview lib, remove workaround	2015-03-03 15:56:03 +01:00