fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-01-19 14:44:31 -05:00
parent b23f976511
commit a3fb7347b9

View File

@ -3,7 +3,7 @@ Emby Server
Emby Server is a home media server built on top of other popular open source technologies such as **Service Stack**, **jQuery**, **jQuery mobile**, and **Mono**.
It features a REST-based api with built-in documention to facilitate client development. We also have client libraries for our api to enable rapid development.
It features a REST-based API with built-in documention to facilitate client development. We also have client libraries for our API to enable rapid development.
## Emby Apps