Merge branch 'feature/workflows' into development

Conflicts: apps/dynamic_search/__init__.py requirements/production.txt
2012-05-23 00:23:39 -04:00
parent a65031dab5 15156b326b
commit db13cd1702
65 changed files with 2531 additions and 843 deletions
--- a/settings.py
+++ b/settings.py
@@ -176,7 +176,7 @@ INSTALLED_APPS = (
    'main',
    'rest_api',
    'document_signatures',
-
+    'workflows',
 # Has to be last so the other apps can register it's signals
    'signaler',
 )