Serraniel 9c141e9f5c Merge branch 'master' into develop ... # Conflicts: # Discord Media Loader.Application/Classes/Core.cs # Discord Media Loader.Application/Classes/Job.cs # Discord Media Loader.Application/Classes/JobScheduler.cs # Discord Media Loader.Application/Classes/Settings.cs # Discord Media Loader.Application/MainForm.cs		2019-02-15 16:58:01 +01:00
..
RPC	Added helper file	2018-04-01 20:16:17 +02:00
Core.cs	Merge branch 'master' into develop	2019-02-15 16:58:01 +01:00
Job.cs	Fixed nuget referencing to SweetLib and maintained code so it will compile with current SweetLib Version	2018-05-20 16:22:04 +02:00
JobScheduler.cs	Merge branch 'master' into develop	2019-02-15 16:58:01 +01:00
Settings.cs	Merge branch 'master' into develop	2019-02-15 16:58:01 +01:00