ariskotsomitopoulos 07eabf110d Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics ... # Conflicts: # vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt		2022-03-15 14:23:48 +01:00
..
assets	Add licence mention as per https://github.com/maplibre/maplibre-gl-native/blob/master/LICENSE.md	2022-01-25 17:51:17 +01:00
java/im/vector/app	Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics	2022-03-15 14:23:48 +01:00
res	Revert temporary fix for develop crash	2022-03-15 11:26:00 +01:00
AndroidManifest.xml	Merge pull request #4498 from vector-im/yostyle/fix_strandhogg	2022-03-03 15:05:29 +01:00