ganfra df4f0eac20 Merge branch 'feature/sync_ui' into develop		2019-06-13 18:16:45 +02:00
..
assets	Settings: add some webview content	2019-06-12 10:53:48 +02:00
java/im/vector/riotredesign	Merge branch 'feature/sync_ui' into develop	2019-06-13 18:16:45 +02:00
res	Merge branch 'feature/sync_ui' into develop	2019-06-13 18:16:45 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/crypto	2019-06-07 18:53:24 +02:00