Onuray Sahin 202c0c58ab Merge branch 'develop' into feature/ons/toggle_ip_address_visibility ... # Conflicts: # vector/src/test/java/im/vector/app/features/settings/devices/v2/overview/SessionOverviewViewModelTest.kt		2022-11-10 17:01:50 +03:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge branch 'develop' into feature/ons/toggle_ip_address_visibility	2022-11-10 17:01:50 +03:00
.gitignore
build.gradle	Merge pull request #7498 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.12.0	2022-11-07 15:42:59 +01:00