Update timeside, add timeside own url

diff --git a/.gitmodules b/.gitmodules
index 31249a886157208c331f88d55e96775bef79a4fc..bda2025fac8cc9bfa163888fe44cec4c48b9a05d 100644 (file)
--- 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 86f699cd61db2c0dc7fed61c4bb9f44ca3d8868f..3dc154a0e6ebf7e5892bf15a7d5364a06d5b47fb 160000 (submodule)
--- 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 837f667607dccdff262a7fc2687adc8c7247ddc4..48d85ac4b88ac995bd13038a8469f0230c229b72 100644 (file)
--- 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')),
 
 
 ]