Barbara Kudiess 76d402fcfa Merge branch 'master' into dotnet-core-upgrade ... # Conflicts: # src/modules/launcher/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj # src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj # src/modules/launcher/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj # src/modules/launcher/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj # src/modules/launcher/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj # src/modules/launcher/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj # src/modules/launcher/Plugins/Wox.Plugin.Indexer/Properties/AssemblyInfo.cs # src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj # src/modules/launcher/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj # src/modules/launcher/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj # src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj # src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj # src/modules/launcher/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj # src/modules/launcher/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj # src/modules/launcher/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj # src/modules/launcher/Wox.Core/Wox.Core.csproj # src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj # src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj # src/modules/launcher/Wox.Test/Wox.Test.csproj # src/modules/launcher/Wox/Wox.csproj		2020-03-23 17:28:10 -07:00
..
example_powertoy	PCH: remove headers which are actually could be changed (#950)	2019-12-17 11:21:46 +03:00
fancyzones	FancyZones editor magnetic snapping effect (#1503)	2020-03-10 15:50:44 +01:00
interface	Devdocs reorganisation (#913)	2019-12-12 12:25:19 +03:00
launcher	Merge branch 'master' into dotnet-core-upgrade	2020-03-23 17:28:10 -07:00
powerrename	Remove unused check for pClassFactory (#1419)	2020-03-07 16:25:12 -08:00
shortcut_guide	Fix crash when saving any module settings while module being disabled (#1259)	2020-02-11 07:57:11 +01:00
windowwalker	Switch WindowWalker C# project to use PackageReference (#1374)	2020-03-07 16:28:53 -08:00