Serraniel 5cd9a0c200 Merge branch 'develop' into feature/DatabaseJobs ... # 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/DML.Application.csproj		2018-04-23 21:59:29 +02:00
..
RPC	Added helper file	2018-04-01 20:16:17 +02:00
Core.cs	Merge branch 'develop' into feature/DatabaseJobs	2018-04-23 21:59:29 +02:00
Job.cs	Merge branch 'develop' into feature/DatabaseJobs	2018-04-23 21:59:29 +02:00
JobScheduler.cs	Merge branch 'develop' into feature/DatabaseJobs	2018-04-23 21:59:29 +02:00
MediaData.cs	Reduced uses	2018-02-01 21:36:38 +01:00
Settings.cs	Merge branch 'develop' into feature/DatabaseJobs	2018-04-23 21:59:29 +02:00