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

..

src/main

Merge branch 'development' into detached-sigs-api

2015-01-27 09:46:42 +01:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Material Design Drawer

2015-01-26 15:24:42 +01:00