master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
423f841a2a
schildichat-android/vector-app/src
History
SpiritCroc 965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
2023-04-05 11:28:26 +02:00
..
androidTest/java/im/vector/app Bump fragment from 1.6.0-alpha04 to 1.6.0-alpha06 (#8165) 2023-03-08 17:58:08 +01:00
debug Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
fdroid Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
gplay Move clock to core-utils module 2023-01-31 16:45:48 +01:00
main Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +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