Gil Eluard 996ef72498 Merge branch 'develop' into gil/SP1_space_creation ... # Conflicts: # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.h # Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift		2022-03-08 11:23:55 +01:00
..
Animators	Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137	2021-12-03 11:47:24 +01:00
Assets/MatrixKitAssets.bundle	Merge MatrixKit strings into Vector strings.	2022-03-03 09:34:54 +00:00
Categories	Remove unused NSBundle extension methods.	2022-03-03 10:04:20 +00:00
Controllers	Instrument missing screen metrics (#5764)	2022-03-08 10:13:46 +01:00
Libs/SwiftUTI	Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.	2022-02-10 08:43:18 +02:00
Models	Rename profile as userAvatarAndName	2022-03-07 13:45:02 +01:00
Utils	Remove MatrixKitL10n from SwiftGen	2022-03-03 09:34:54 +00:00
Views	Merge branch 'develop' into gil/SP1_space_creation	2022-03-04 13:38:18 +01:00
MatrixKit-Bridging-Header.h	Move all MatrixKit cells + MXKRoomViewController into appropriated folders.	2022-01-21 17:18:59 +01:00
MatrixKit.h	Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.	2022-02-10 08:43:18 +02:00
MatrixKitVersion.m	Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137	2021-12-03 11:47:24 +01:00