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

Merge branch '3.0release' into 4.0release

This commit is contained in:
winlin 2020-06-24 11:39:17 +08:00
commit 14afe78662

View file

@ -32,7 +32,7 @@ cd srs/trunk && git remote set-url origin https://github.com/ossrs/srs.git && gi
> Note: You can also build SRS in docker, please read [docker][docker-dev]. > Note: You can also build SRS in docker, please read [docker][docker-dev].
**Step 3:** Run SRS **>>> Step 3:** Run SRS
``` ```
./objs/srs -c conf/srs.conf ./objs/srs -c conf/srs.conf
@ -1678,6 +1678,7 @@ Winlin
[bug #1488]: https://github.com/ossrs/srs/issues/1488 [bug #1488]: https://github.com/ossrs/srs/issues/1488
[bug #1551]: https://github.com/ossrs/srs/pull/1551 [bug #1551]: https://github.com/ossrs/srs/pull/1551
[bug #1554]: https://github.com/ossrs/srs/pull/1554 [bug #1554]: https://github.com/ossrs/srs/pull/1554
[bug #1672]: https://github.com/ossrs/srs/issues/1672
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[bug #735]: https://github.com/ossrs/srs/issues/735 [bug #735]: https://github.com/ossrs/srs/issues/735