Merge branch '2.0release' into develop

pull/763/head
winlin 8 years ago
commit 72ceeaf2ff

@ -2,6 +2,7 @@
[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/develop.svg?style=svg)](https://circleci.com/gh/ossrs/srs/tree/develop)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ossrs/srs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Wechat](https://cloud.githubusercontent.com/assets/2777660/22814604/ecc2e04e-ef8f-11e6-8922-303af7ca46df.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
SRS/3.0, [OuXuli][release3]<br/>
SRS是大娱乐直播领域广泛应用的野鸡服务器志存高远不限于色情行业。<br/>

Loading…
Cancel
Save