1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00

Merge branch '2.0release' into develop

This commit is contained in:
winlin 2015-03-15 21:56:39 +08:00
commit 19ec1dafb7

View file

@ -184,20 +184,6 @@ StreamServers[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https
[RED5](http://www.red5.org/), [WOWZA](http://www.wowza.com/),
[FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html)
## Contact
For QQ group, scan the following:
![Tencent QQ Group](http://winlinvip.github.io/srs.release/wiki/images/srs_qq_95.png)
Or join QQ group by number "365936885", where you can get realtime support.
For weixin, scan the following:
![Weixin](http://winlinvip.github.io/srs.release/wiki/images/srs_weixin_430.jpg)
Or join weixin by account "srs-server", where you can get latest news about SRS.
## AUTHORS
There are three types of people that have contributed to the SRS project: