Merge remote-tracking branch 'refs/remotes/origin/master' into breaking-change
# Conflicts: # README.md # Titanium.Web.Proxy.Test/App.config # Titanium.Web.Proxy.Test/Properties/AssemblyInfo.cs # Titanium.Web.Proxy.sln # Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs # Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs # Titanium.Web.Proxy/Helpers/Tcp.cs # Titanium.Web.Proxy/Properties/AssemblyInfo.cs # Titanium.Web.Proxy/ProxyServer.cs # Titanium.Web.Proxy/RequestHandler.cs # Titanium.Web.Proxy/ResponseHandler.cs # Titanium.Web.Proxy/Titanium.Web.Proxy.csproj # Titanium.Web.Proxy/packages.config
Showing
.build/Bootstrap.ps1
0 → 100644
.build/Common.psm1
0 → 100644
.build/default.ps1
0 → 100644
File deleted
appveyor.yml
0 → 100644
Please
register
or
sign in
to comment