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

merge from 1.0

This commit is contained in:
winlin 2014-12-26 12:59:54 +08:00
commit 3218efd242

View file

@ -1135,4 +1135,3 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS
Beijing, 2013.10<br/> Beijing, 2013.10<br/>
Winlin Winlin