Commit fc3f277f authored by Anze Vavpetic's avatar Anze Vavpetic

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

Conflicts:
	mothra/settings.py
parents 9712d6fd 22221f4d
......@@ -198,6 +198,7 @@ else:
'workflows.bioinformatics',
'workflows.subgroup_discovery',
'workflows.nlp',
'workflows.base',
'website',
'signuplogin',
'django_extensions',
......
This diff is collapsed.
from django.core.management.base import BaseCommand, CommandError
from workflows.models import Category, AbstractWidget, AbstractInput, AbstractOutput, AbstractOption
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
......
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