Gil Eluard 13fbc75ea5 Merge branch 'develop' into element_4181 ...

# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift

2021-04-06 15:59:40 +02:00

..

Assets

Merge branch 'develop' into element_4133

2021-03-24 22:41:37 +01:00

Categories

SR sizing is inconsistent with RR & Message states cosmetic changes

2021-03-17 20:09:44 +01:00

Coordinators

…

Generated

Merge pull request #4122 from vector-im/element_4085

2021-04-02 11:34:05 +02:00

Managers

Merge branch 'develop' into element_4181

2021-04-06 15:59:40 +02:00

Model

…

Modules

Merge branch 'develop' into element_4181

2021-04-06 15:59:40 +02:00

Routers

Fix review remarks.

2020-09-24 16:25:10 +02:00

SupportingFiles

Composer Update - Typing and sending a message

2021-03-15 14:27:59 +01:00

Utils

Improve the status of send messages (sending, sent, received, failed)

2021-02-25 19:38:59 +01:00

Common.xcconfig

XcodeGen: Use same names for yml and xcconfig files in every target

2021-02-11 09:21:00 +01:00

Debug.xcconfig

XcodeGen: Use same names for yml and xcconfig files in every target

2021-02-11 09:21:00 +01:00

Release.xcconfig

XcodeGen: Use same names for yml and xcconfig files in every target

2021-02-11 09:21:00 +01:00

target.yml

XcodeGen: Remove old files, probably residual from a git mv

2021-02-16 08:44:26 +01:00