Mark McDowall a7eb331d4e Merge branch 'ui-notifications' into develop ...

Conflicts:
	NzbDrone.Common/NzbDrone.Common.csproj
	UI/Series/Details/SeasonLayout.js

2013-09-03 07:18:04 -07:00

..

UpdateXemMappingsCommand.cs

Commands return immediately and signalr is used to control the UI

2013-09-01 21:12:41 -07:00

VideoFileInfoReader.cs

back to tiny for now

2013-05-10 20:43:52 -07:00

XemCommunicationProvider.cs

moved logging config to in-process

2013-09-02 22:15:08 -07:00

XemProvider.cs

Merge branch 'ui-notifications' into develop

2013-09-03 07:18:04 -07:00