ganfra 30bfada5d2 Merge branch 'feature/room_list' into develop		2019-01-31 12:15:43 +01:00
..
androidTest/java/im/vector/matrix/android	Update copyright and add to last merged commits	2019-01-25 14:04:59 +01:00
main	Merge branch 'feature/room_list' into develop	2019-01-31 12:15:43 +01:00