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
..
AssemblyInfo.cs	Merge branch 'develop' into feature/DatabaseJobs	2018-04-23 21:59:29 +02:00
Resources.Designer.cs	Some finalisation	2017-04-30 11:29:49 +02:00
Resources.resx	Some finalisation	2017-04-30 11:29:49 +02:00