From: Guillaume Pellerin Date: Thu, 21 Dec 2017 09:58:05 +0000 (+0100) Subject: Update timeside, add timeside own url X-Git-Tag: 1.7.0~2^2~6 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9c6a77974b338781db2971d66c96834b94ab2bb8;p=telemeta.git Update timeside, add timeside own url --- diff --git a/.gitmodules b/.gitmodules index 31249a88..bda2025f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,4 @@ [submodule "lib/TimeSide"] path = lib/TimeSide url = https://github.com/Parisson/TimeSide.git + ignore = dirty diff --git a/lib/TimeSide b/lib/TimeSide index 86f699cd..3dc154a0 160000 --- a/lib/TimeSide +++ b/lib/TimeSide @@ -1 +1 @@ -Subproject commit 86f699cd61db2c0dc7fed61c4bb9f44ca3d8868f +Subproject commit 3dc154a0e6ebf7e5892bf15a7d5364a06d5b47fb diff --git a/telemeta/urls.py b/telemeta/urls.py index 837f6676..48d85ac4 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -272,7 +272,7 @@ urlpatterns = [ url(r'^', include('jqchat.urls')), # Timeside - #url(r'^timeside/', include('timeside.server.urls')), + url(r'^timeside/', include('timeside.server.urls')), ]