fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent b23f976511
commit a3fb7347b9

@ -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**. 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 ## Emby Apps

Loading…
Cancel
Save