Commit 119571b2 authored by matjaz's avatar matjaz

Merge remote-tracking branch 'remotes/origin/dev' into dev_package_independance

Conflicts:
	workflows/latino/library_gen.py
	workflows/latino/serialization_utils.py
parents 9776fc82 22221f4d
......@@ -190,6 +190,7 @@ else:
'south',
'workflows',
'workflows.latino',
'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