Files
PowerToys/src/modules/launcher/Wox.Test
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
..
2020-03-20 09:43:42 -07:00