merge qbe in rh : conflits réglés

[auf_rh_dae.git] / buildout.cfg

diff --git a/buildout.cfg b/buildout.cfg
index 6107390..a79b2bf 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -10,6 +10,7 @@ find-links = http://pypi.auf.org/simple/auf.recipe.django/
     http://pypi.auf.org/simple/auf.django.workflow/
     http://pypi.auf.org/simple/auf.django.admingroup/
     http://pypi.auf.org/simple/auf.django.metadata/
+    http://pypi.auf.org/simple/auf.django.emploi/
     http://pypi.auf.org/django-alphafilter/
 
 develop = src/*
@@ -27,11 +28,12 @@ eggs =
     django-reversion
     simplejson
     django-ajax-selects
-    auf.django.metadata
-    django-alphafilter
     django-form-utils
     django-tinymce
     django-simple-captcha
+    auf.django.metadata
+    django-alphafilter
+    django-sendfile
     django-qbe
 
 # LA PROD ne dispose que de reportlab 2.1, incompatible avec
@@ -52,19 +54,15 @@ django-reversion = 1.3.3
 auf.django.workflow = 0.14dev
 django-ajax-selects = 1.1.4
 django-alphafilter = 0.5.3auf4
+auf.django.emploi = 0.5dev
 #reportlab = 2.5
 #html5lib = 0.90
 #pyPDF = 1.13
 #pisa = 3.0.33
 
-#reportlab = 2.5
-#html5lib = 0.90
-#pyPDF = 1.13
-#pisa = 3.0.33
-
-[django] 
+[django]
 recipe = auf.recipe.django
-wsgi=true 
+wsgi=true
 settings=production
 extra-paths = project
 eggs =${buildout:eggs}