1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Merge branch '2.0release' into develop

This commit is contained in:
winlin 2017-02-10 13:15:51 +08:00
commit ebc1be913f

View file

@ -2,7 +2,7 @@
[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/develop.svg?style=svg)](https://circleci.com/gh/ossrs/srs/tree/develop) [![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) [![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) [![Wechat](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
SRS/3.0, [OuXuli][release3]<br/> SRS/3.0, [OuXuli][release3]<br/>
SRS是大娱乐直播领域广泛应用的野鸡服务器志存高远不限于色情行业。<br/> SRS是大娱乐直播领域广泛应用的野鸡服务器志存高远不限于色情行业。<br/>