Vincent Breitmoser c871891f49 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java

2014-09-24 01:42:17 +02:00

..

src/main

Merge remote-tracking branch 'origin/master'

2014-09-24 01:42:17 +02:00

.gitignore

…

build.gradle

Add safeslinger to build

2014-09-04 11:30:36 +02:00