kay.one 012fa88301 Merge branch 'markus' into kay.one ... Conflicts: NzbDrone/NzbDrone.csproj NzbDrone/Providers/ConfigProvider.cs		2011-10-09 10:45:08 -07:00
..
ApplicationMode.cs	Merge branch 'markus' into kay.one	2011-10-09 10:45:08 -07:00
AuthenticationType.cs	Configuring the AuthenticationType from the WebUI will now work, just restart and NzbDrone will change the AuthenticationType on start.	2011-10-07 17:17:46 -07:00
ProcessInfo.cs	Merge branch 'markus' into kay.one	2011-10-09 10:45:08 -07:00