Merge branch 'srs.master'

pull/133/head
winlin 10 years ago
commit 66d0b31e12

@ -158,7 +158,7 @@ cd simple-rtmp-server/trunk
## Wiki ## Wiki
Please select your language: Please select your language:
* [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN__Home) * [English](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Home)
* [Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home) * [Chinese](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Home)
## Donation ## Donation

Loading…
Cancel
Save