• titanium007's avatar
    Merge remote-tracking branch 'refs/remotes/origin/master' into breaking-change · 27fc293a
    titanium007 authored
    # 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
    27fc293a
SessionEventArgs.cs 12.4 KB