Push upstream changes into main trunk

MediaBrowser / SocketHttpListener

A standalone HttpListener with support for SSL, WebSockets and Mono

MIT License

42 stars 14 forks source link

Closed tekhedd closed 7 years ago

tekhedd commented 7 years ago

One conflict because of a comment. Pfaugh.

tekhedd commented 7 years ago

This was supposed to be local. Stupid git. :D Sorry, my bad.