mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 18:36:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector-app/src
History
SpiritCroc 87100a8536 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00
..
androidTest/java/im/vector/app added UI tests for new App Layout's screens (#7305) 2022-10-24 11:01:44 +02:00
debug Merge remote-tracking branch 'upstream/develop' into sc 2022-12-07 14:56:07 +01:00
fdroid Merge remote-tracking branch 'upstream/develop' into sc 2022-12-07 14:56:07 +01:00
gplay Merge remote-tracking branch 'upstream/develop' into sc 2022-12-07 14:56:07 +01:00
main Re-generate icons 2022-12-03 15:44:11 +01:00
nightly/res/xml lifting nightly to the application module 2022-09-15 14:50:08 +01:00
release Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00