SchildiChat-android/vector/src/main
SpiritCroc 2fa4518600 Revert "Revert "Setting for unread badge / room summary event visibility""
This reverts commit 1ff602db3b.

Change-Id: I161a6dcbbee2b2dc517912f6fb1f6b2ec772df0b

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
2020-09-22 10:05:36 +02:00
..
assets Support for image compression on Android 10 2020-09-04 09:36:18 +02:00
java/im/vector/app Revert "Revert "Setting for unread badge / room summary event visibility"" 2020-09-22 10:05:36 +02:00
res Revert "Revert "Setting for unread badge / room summary event visibility"" 2020-09-22 10:05:36 +02:00
AndroidManifest.xml Merge remote-tracking branch 'upstream/master' into sc 2020-09-08 18:52:59 +02:00