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
..
.gitignore
4612.misc
4669.bugfix
7274.bugfix	Fix bad pills color background. For light and dark theme the color is now 61708B (iso EleWeb)	2022-12-02 10:50:08 +01:00
7477.misc	changelog	2022-10-27 14:30:36 +01:00
7596.feature	Adding changelog entry	2022-12-05 09:43:55 +01:00
7632.feature	Adding changelog entry	2022-12-05 09:46:14 +01:00
7653.bugfix	Adding changelog entry	2022-12-05 09:41:23 +01:00
7658.bugfix	Move changelog entry to correct dir	2022-12-01 17:15:23 +00:00
7659.bugfix	[Rich text editor] Fix keyboard closing after collapsing rich text editor (#7659)	2022-12-01 13:39:01 +00:00
7680.bugfix	Rich Text Editor: fix several inset issues in room screen (#7681)	2022-12-01 10:26:55 +00:00
7683.bugfix	Fix crash in message composer when room is missing (#7683)	2022-12-02 08:41:33 +00:00
7684.bugfix	Changelog	2022-12-01 15:38:31 +01:00
7693.feature	Adding changelog entry	2022-12-02 16:50:46 +01:00
7694.feature	Add changelog.	2022-12-02 19:02:55 +03:00
7710.bugfix	Add changelog.	2022-12-05 18:18:09 +03:00
7725.bugfix	Changelog	2022-12-07 13:54:20 +01:00