aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily <just.one.man@yandex.ru>2019-02-23 01:51:34 +0300
committerVasily <just.one.man@yandex.ru>2019-02-23 01:52:51 +0300
commit7ae526da8b8d71e57aaa715d0e9698e7049d4cf9 (patch)
treef8005e1c35493b93b2d0b479b07426173c205554
parente7e7d96f5177fd9185aead256120d48c6324ffa1 (diff)
parentdb54fe4c704ae0309a7f20be1ef2cb8cbbad5a8e (diff)
Merging #975 to master
-rw-r--r--.gitmodules1
m---------MediaBrowser.WebDashboard/jellyfin-web0
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index c10f5905c..2b97b1331 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
[submodule "MediaBrowser.WebDashboard/jellyfin-web"]
path = MediaBrowser.WebDashboard/jellyfin-web
url = https://github.com/jellyfin/jellyfin-web.git
+ branch = .
diff --git a/MediaBrowser.WebDashboard/jellyfin-web b/MediaBrowser.WebDashboard/jellyfin-web
-Subproject b4842e325e9d7d708193b4a27060cfe4c978df5
+Subproject ec5a3b6e5efb6041153b92818aee562f20ee994