diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-04-20 19:07:29 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-04-20 19:07:29 +0200 |
| commit | 64b8be1b39f22e9ace12f7d98fe6aa759db74111 (patch) | |
| tree | 0bcdffda7369d7ab59466c59638d505e0c669089 /MediaBrowser.Model/Configuration/ServerConfiguration.cs | |
| parent | c230dab0bd3ce929992b6452b63ebe55e2d906bd (diff) | |
| parent | 9e0c73ef1946cd49de43f972839af90c465dcfb1 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Conflicts:
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
Diffstat (limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')
0 files changed, 0 insertions, 0 deletions