Luke Pulverenti c74acaae59 fix merge conflicts		2016-11-01 00:39:11 -04:00
..
Configuration
Cryptography
Devices
HttpClientManager
IO	consolidate internal interfaces	2016-10-31 00:28:23 -04:00
Logging	move dependencies	2016-10-29 16:13:23 -04:00
Networking
Properties
ScheduledTasks
Serialization	update audio queries	2016-10-31 01:51:43 -04:00
Updates
BaseApplicationHost.cs
BaseApplicationPaths.cs
Emby.Common.Implementations.xproj
project.json
project.lock.json