Vincent Breitmoser 6cf7e3e541 Merge branch 'master' into encrypted-export

2015-10-08 20:05:56 +02:00

..

java/org/sufficientlysecure/keychain

Merge branch 'master' into encrypted-export

2015-10-08 20:05:56 +02:00

resources

Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds

2015-06-11 00:05:13 +02:00