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	Created Downloader	2017-04-16 17:57:27 +02:00
Resources.resx	Created Downloader	2017-04-16 17:57:27 +02:00
Settings.Designer.cs	Fixed some project things	2017-04-29 10:43:43 +02:00
Settings.settings	Recreated project files	2017-03-09 20:08:35 +01:00