pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-26 19:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1d46f8520daee3adc2c853aa3bc76f191ec43f7e
Essentials/Essentials Core
History
Neil Dorin 3b3ea98dea Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2 
Conflicts:
	Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs
	Essentials Devices Common/Essentials Devices Common/Codec/eCodecCallStatus.cs
	Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs
	Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
2017-09-21 11:57:48 -06:00
..
PepperDashEssentialsBase
Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2
2017-09-21 11:57:48 -06:00
PepperDashEssentialsBase.sln
Combining repos
2017-03-21 08:36:26 -06:00