Gil Eluard d0e0dc856e Merge branch 'element_4014' into element_4013 ... # Conflicts: # Riot/Modules/Room/DataSources/RoomDataSource.m		2021-03-09 13:22:13 +01:00
..
Assets	Merge branch 'element_4014' into element_4013	2021-03-09 13:22:13 +01:00
Categories	Merge branch 'element_4014' into element_4013	2021-03-09 13:22:13 +01:00
Coordinators	Remove SimpleCoordinator	2020-09-23 11:14:14 +03:00
Generated	Merge branch 'element_4014' into element_4013	2021-03-09 13:22:13 +01:00
Managers	Merge branch 'develop' into element_4014	2021-03-04 11:19:40 +01:00
Model	RoomPowerLevel: Add dedicated file and convenient init.	2020-04-08 12:32:36 +02:00
Modules	Merge branch 'element_4014' into element_4013	2021-03-09 13:22:13 +01:00
Routers	Fix review remarks.	2020-09-24 16:25:10 +02:00
SupportingFiles	Merge remote-tracking branch 'origin/develop' into element_3812	2021-02-11 16:19:12 +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