diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:44:31 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-19 14:44:31 -0500 |
| commit | a3fb7347b9cfe094e8aa6c8d688d1926b0933566 (patch) | |
| tree | 3c1424585f41551625990610cdc52f1e611c16ab | |
| parent | b23f9765117820481cce204461df10bcdbc8c466 (diff) | |
fix merge conflict
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |