mar-v-in d1d414c006 Merge branch 'master' into improve-file-more ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java

2014-07-01 00:15:30 +02:00

..

src

Merge branch 'master' into improve-file-more

2014-07-01 00:15:30 +02:00

.gitignore

Fix gitignore for lint

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

build.gradle

Deprecated Android Bootstrap, thus fixing #597

2014-06-30 19:18:20 +02:00