Gil Eluard b4eee99d03 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces ...

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift

2022-01-13 16:30:55 +01:00

..

Animators

Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

2021-12-03 11:47:24 +01:00

Assets/MatrixKitAssets.bundle

Merge branch 'origin/develop' into Weblate.

2022-01-11 11:26:12 +00:00

Categories

Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

2021-12-03 11:47:24 +01:00

Controllers

vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages.

2022-01-04 17:33:32 +02:00

Libs/SwiftUTI

Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

2021-12-03 11:47:24 +01:00

Models

Merge branch 'develop' into ismail/4384_summary_db

2022-01-08 00:54:17 +03:00

Utils

vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages.

2022-01-04 17:33:32 +02:00

Views

SP3.1: Update room settings for Spaces element-ios#5231

2022-01-13 15:53:45 +01:00

MatrixKit-Bridging-Header.h

Prepare the MatrixKit-Bridging-Header.h for new MatrixKit location.

2021-11-30 17:24:12 +01:00

MatrixKit.h

Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

2021-12-03 11:47:24 +01:00

MatrixKitVersion.m

Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

2021-12-03 11:47:24 +01:00