Coupure prévue mardi 3 Août au matin pour maintenance du serveur. Nous faisons au mieux pour que celle-ci soit la plus brève possible.

Commit 4f716f1c authored by matjaz's avatar matjaz
Browse files

Merge branch 'dev_latino' into dev (last merge since separate dev_latino...

Merge branch 'dev_latino' into dev (last merge since separate dev_latino branch will be terminated afterwards)
parents 83ba8e69 e3593d9b
......@@ -170,6 +170,7 @@ if USE_CONCURRENCY:
'django.contrib.admin',
'south',
'workflows',
'workflows.latino',
'website',
'signuplogin',
'django_extensions',
......@@ -188,6 +189,7 @@ else:
'django.contrib.admin',
'south',
'workflows',
'workflows.latino',
'website',
'signuplogin',
'django_extensions',
......
from django.shortcuts import render
from decision_support.interaction import *
from latino.interaction_views import *
def test_interaction(request,input_dict,output_dict,widget):
return render(request, 'interactions/test_interaction.html',{'widget':widget})
......
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment