diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-01 22:21:58 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-01 22:21:58 -0500 |
| commit | 1cdb420d2e815baa16e52ddef056b947716e37bb (patch) | |
| tree | 523416a4d410cb84a97555593c3c187168dd54e3 /MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | |
| parent | bb26e05e1e71fbbf0bc842f591a2157fa471b2be (diff) | |
| parent | 11e5d194b41cabf5a9320198d2b61484aba00115 (diff) | |
Merge branch 'beta' into dev
Conflicts:
MediaBrowser.Api/StartupWizardService.cs
MediaBrowser.Model/Configuration/ServerConfiguration.cs
MediaBrowser.Server.Implementations/Dto/DtoService.cs
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
MediaBrowser.Server.Implementations/Localization/Core/ca.json
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
MediaBrowser.Server.Implementations/packages.config
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json
MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json
MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json
SharedVersion.cs
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs')
0 files changed, 0 insertions, 0 deletions