diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-04-17 17:07:47 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-04-17 17:07:47 -0400 |
| commit | dcee70a7c832d52856e3f7692086d50a37ab1c83 (patch) | |
| tree | fef9b41ce23eec36a56cdbdba2dfa6b1c192c6f6 | |
| parent | 565b3350a125cf49cd288542bf28188ef906dd10 (diff) | |
| parent | e5e9ac500b1ab33271ca85b3a304aecd0a594d38 (diff) | |
Merge pull request #1663 from MediaBrowser/master
merge from master
| -rw-r--r-- | MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 6 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 01531c3a3..237325cfe 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -1316,6 +1316,9 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\layoutmanager.js</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\objectassign.js">
+ <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\objectassign.js</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\qualityoptions.js</Link>
</BundleResource>
@@ -2525,6 +2528,9 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-input\test\letters-only.html">
<Link>Resources\dashboard-ui\bower_components\iron-input\test\letters-only.html</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-location\.github\ISSUE_TEMPLATE.md">
+ <Link>Resources\dashboard-ui\bower_components\iron-location\.github\ISSUE_TEMPLATE.md</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\iron-media-query\.bower.json">
<Link>Resources\dashboard-ui\bower_components\iron-media-query\.bower.json</Link>
</BundleResource>
diff --git a/SharedVersion.cs b/SharedVersion.cs index 2d2a44ae5..b9bd3b88e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5911")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5913")] |