element-ios/Riot
ismailgulek df1d60139f Merge branch 'voip_call_transfer' into voip_all
# Conflicts:
#	Podfile
#	Podfile.lock
#	Riot.xcodeproj/project.pbxproj
2021-02-10 00:47:51 +03:00
..
Assets Merge branch 'voip_call_transfer' into voip_all 2021-02-10 00:47:51 +03:00
Categories Voip all 2021-02-03 14:01:29 +03:00
Coordinators Remove SimpleCoordinator 2020-09-23 11:14:14 +03:00
Generated Merge branch 'voip_call_transfer' into voip_all 2021-02-10 00:47:51 +03:00
Managers Merge branch 'voip_call_transfer' into voip_all 2021-02-10 00:47:51 +03:00
Model RoomPowerLevel: Add dedicated file and convenient init. 2020-04-08 12:32:36 +02:00
Modules Merge branch 'voip_call_transfer' into voip_all 2021-02-10 00:47:51 +03:00
Routers Fix review remarks. 2020-09-24 16:25:10 +02:00
SupportingFiles Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
Utils Voip all 2021-02-03 14:01:29 +03:00