diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-03-16 18:08:30 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-03-16 18:08:30 -0400 |
| commit | f1acaaee3e48816c9dd0c6f67b3cc90c5c03c65f (patch) | |
| tree | 11d2bf53765d9ba246d858fd51899266e7d83284 | |
| parent | 2248b8f2e2d6697ba8eb58ba897c02edd74cd378 (diff) | |
| parent | e6a36f06790ff9d19970ce6bd8e8bd73dc971102 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs | 2 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs index b2f0a2769..65bbb35ba 100644 --- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs +++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs @@ -267,7 +267,7 @@ namespace MediaBrowser.Server.Implementations.IO } else { - Logger.Info("Unable to add directory watcher for {0}. It already exists in the dictionary." + path); + Logger.Info("Unable to add directory watcher for {0}. It already exists in the dictionary.", path); newWatcher.Dispose(); } @@ -1,9 +1,9 @@ Media Browser ============ -Media Browser Server is a home media server built on top of other popular open source technologies such as **Service Stack**, **jQuery**, **jQuery mobile** and **Lucene .NET**. +Media Browser 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 full .net and javascript wrappers around the api. +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. We have several client apps released and in production: |