master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
e02a3adcdf
schildichat-android/vector-app/src
History
SpiritCroc 25dddf7566 Merge tag 'v1.5.16' into sc 
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
..
androidTest/java/im/vector/app try fix lint 2022-12-29 10:51:57 +01:00
debug Merge remote-tracking branch 'upstream/develop' into sc 2022-12-07 14:56:07 +01:00
fdroid Merge tag 'v1.5.12' into sc 2022-12-15 11:01:52 +01:00
gplay [merge] Fix gplay build 2022-12-15 11:45:48 +01:00
main Merge tag 'v1.5.16' into sc 2022-12-30 17:58:06 +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