ganfra 4a6b28aca1 Merge branch 'feature/timeline_events' into develop		2019-01-17 15:33:13 +01:00
..
androidTest/java/im/vector/matrix/android	Migration androidx : first commit where it compiles. Updates some libs and android studio version in the same time.	2019-01-16 19:25:43 +01:00
main	Merge branch 'feature/timeline_events' into develop	2019-01-17 15:33:13 +01:00