element-ios/Riot
ismailgulek 46f4a4f3d1 Merge branch 'voip_dialpad' into voip_dtmf
# Conflicts:
#	CHANGES.rst
2021-02-10 00:40:22 +03:00
..
Assets Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
Categories Merge branch 'voip_2746' into voip_dialpad 2021-01-20 16:25:36 +03:00
Coordinators Remove SimpleCoordinator 2020-09-23 11:14:14 +03:00
Generated Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
Managers Merge branch 'voip_2746' of https://github.com/vector-im/element-ios into voip_2746 2021-02-07 20:26:51 +03:00
Model RoomPowerLevel: Add dedicated file and convenient init. 2020-04-08 12:32:36 +02:00
Modules Merge branch 'voip_dialpad' into voip_dtmf 2021-02-10 00:40:22 +03:00
Routers Fix review remarks. 2020-09-24 16:25:10 +02:00
SupportingFiles Merge branch 'develop' into voip_2746 2021-02-05 12:11:39 +03:00
Utils Merge branch 'develop' into voip_2746 2021-02-02 12:33:05 +03:00