Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d01fc3a383
|
|
@ -1,3 +1,5 @@
|
|||

|
||||
|
||||
# A lightweight ,high performance and stable stream server and client framework based on C++11.
|
||||
|
||||
[](https://travis-ci.org/xiongziliang/ZLMediaKit)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||

|
||||
# 一个基于C++11的高性能运营级流媒体服务框架
|
||||
[](https://travis-ci.org/xiongziliang/ZLMediaKit)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue