Benoit Marty 191d80e5f5 Fix issue with key importation

2019-06-17 19:05:26 +02:00

..

assets

Settings: add some webview content

2019-06-12 10:53:48 +02:00

java/im/vector/riotredesign

Fix issue with key importation

2019-06-17 19:05:26 +02:00

res

Import keys: WIP

2019-06-17 19:05:26 +02:00

AndroidManifest.xml

Merge branch 'develop' into feature/crypto

2019-06-07 18:53:24 +02:00