Serraniel f29e9e2b8a Merge branch 'develop' into feature/DatabaseJobs ... # Conflicts: # Discord Media Loader.Application/Classes/Core.cs # Discord Media Loader.Application/Classes/JobScheduler.cs # Discord Media Loader.Application/Classes/Settings.cs		2019-02-15 17:13:43 +01:00
..
AssemblyInfo.cs	Merge branch 'develop' into feature/DatabaseJobs	2019-02-15 17:13:43 +01: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