Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
38b26acd87
|
@ -380,9 +380,6 @@
|
|||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvitems.html">
|
||||
<Link>Resources\dashboard-ui\livetvitems.html</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvseriestimer.html">
|
||||
<Link>Resources\dashboard-ui\livetvseriestimer.html</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvsettings.html">
|
||||
<Link>Resources\dashboard-ui\livetvsettings.html</Link>
|
||||
</BundleResource>
|
||||
|
@ -3167,9 +3164,6 @@
|
|||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvschedule.js">
|
||||
<Link>Resources\dashboard-ui\scripts\livetvschedule.js</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimer.js">
|
||||
<Link>Resources\dashboard-ui\scripts\livetvseriestimer.js</Link>
|
||||
</BundleResource>
|
||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvseriestimers.js">
|
||||
<Link>Resources\dashboard-ui\scripts\livetvseriestimers.js</Link>
|
||||
</BundleResource>
|
||||
|
|
Loading…
Reference in New Issue
Block a user