Web Client for Jellyfin
Go to file
Sven Van den brande 1470e95c3b Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/livetvnewrecording.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvseriestimer.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvtimer.html
2014-11-12 19:21:14 +01:00
dashboard-ui Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-11-12 19:21:14 +01:00
app.config upgrade to jquery mobile 1.4.5 2014-11-02 22:38:43 -05:00
packages.config upgrade to jquery mobile 1.4.5 2014-11-02 22:38:43 -05:00