Benoit Marty 498b1f2b06 Merge pull request #261 from vector-im/feature/e2e_file ... Encrypt attachment in e2e rooms		2019-07-02 16:44:17 +02:00
..
androidTest/java/im/vector/riotredesign
debug
fdroid	Fix / fdroid notif was broken due to merge	2019-07-01 13:07:52 +02:00
gplay	Fix bad FCM token stored	2019-06-28 16:54:53 +02:00
main	Merge pull request #261 from vector-im/feature/e2e_file	2019-07-02 16:44:17 +02:00
release
test/java/im/vector/riotredesign