Vincent Breitmoser 19ecd5f427 Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel ...

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

2015-03-30 23:42:38 +02:00

..

src/main

Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel

2015-03-30 23:42:38 +02:00

.gitignore

…

build.gradle

Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of git submodules

2015-03-30 16:08:25 +02:00