open-keychain/OpenKeychain
Vincent Breitmoser 40703fe961 Merge branch 'master' into development
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2015-05-28 16:37:15 +02:00
..
src Merge branch 'master' into development 2015-05-28 16:37:15 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Workaround for Samsung Android 4.2 bug 2015-05-10 04:58:44 +02:00
proguard-rules.pro Add dontnote to proguard 2015-05-10 10:44:04 +02:00