diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-02-23 10:13:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 10:13:02 -0500 |
| commit | 4a3e42e7794bd8b337ded2d38ad12298be7e819e (patch) | |
| tree | 29f3a0db04980e1f9519aecd32361890be738f47 | |
| parent | de45cfdd8c49cac2caeca994242513dad1082d59 (diff) | |
| parent | 7ae526da8b8d71e57aaa715d0e9698e7049d4cf9 (diff) | |
Merge pull request #986 from JustAMan/submodule-update
Backmerge submodule updating strategy
| -rw-r--r-- | .gitmodules | 1 | ||||
| m--------- | MediaBrowser.WebDashboard/jellyfin-web | 0 |
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 |