Commit fc3f277f authored by Anze Vavpetic's avatar Anze Vavpetic
Browse files

Merge branch 'dev' of workflow.ijs.si:mothra into dev

Conflicts:
	mothra/settings.py
parents 9712d6fd 22221f4d
...@@ -198,6 +198,7 @@ else: ...@@ -198,6 +198,7 @@ else:
'workflows.bioinformatics', 'workflows.bioinformatics',
'workflows.subgroup_discovery', 'workflows.subgroup_discovery',
'workflows.nlp', 'workflows.nlp',
'workflows.base',
'website', 'website',
'signuplogin', 'signuplogin',
'django_extensions', 'django_extensions',
......
This diff is collapsed.
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from workflows.models import Category, AbstractWidget, AbstractInput, AbstractOutput, AbstractOption from workflows.models import Category, AbstractWidget, AbstractInput, AbstractOutput, AbstractOption
from django.core import serializers from django.core import serializers
from collections import Counter
#dirty python2.6 fix
try:
from collections import Counter
except:
def Counter(list):
return set(list)
from optparse import make_option from optparse import make_option
......
Supports Markdown
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