Merge branch 'master' into test

[auf_savoirs_en_partage_django.git] / versions.cfg

diff --git a/versions.cfg b/versions.cfg
index 9ba5bab..a1869cb 100644 (file)
--- a/versions.cfg
+++ b/versions.cfg
@@ -1,12 +1,10 @@
 [versions]
 [versions]

-

 # Versions installées sur le serveur de prod
 # Versions installées sur le serveur de prod

-MySQL-python = 1.2.2

 lxml = 2.2.8
 lxml = 2.2.8

+setuptools = 0.6c12dev-r88846
+distribute = 0.6.14

 
 # Versions sélectionnées avant l'utilisation de buildout-versions
 
 # Versions sélectionnées avant l'utilisation de buildout-versions

-auf.recipe.django = 1.7
-django = 1.2.5

 auf_references_client = 0.4.9
 Babel = 0.9.5
 caldav = 0.1.12
 auf_references_client = 0.4.9
 Babel = 0.9.5
 caldav = 0.1.12

@@ -14,7 +12,6 @@ chardet = 1.0.1
 pytz = 2010l
 feedparser = 4.1
 BeautifulSoup = 3.2.0
 pytz = 2010l
 feedparser = 4.1
 BeautifulSoup = 3.2.0

-django_compressor = 0.5.3

 django_pagination = 1.0.7
 django_sorting = 0.1
 django-roa = 2.6.2
 django_pagination = 1.0.7
 django_sorting = 0.1
 django-roa = 2.6.2

@@ -27,17 +24,15 @@ django_exportateur = 1.0
 python-dateutil = 1.5
 auf.django.admingroup = 0.3dev
 auf.django.auth = 0.5.5dev
 python-dateutil = 1.5
 auf.django.admingroup = 0.3dev
 auf.django.auth = 0.5.5dev

-auf.django.references = 0.5

 django-alphafilter = 0.5.3auf4
 django-selectable = 0.2
 
 django-alphafilter = 0.5.3auf4
 django-selectable = 0.2
 

-
-# Added by Buildout Versions at 2012-04-26 10:19:09.922639
+# Added by Buildout Versions at 2012-04-04 16:37:49.534685
+Django = 1.4.2

 auf-references-client = 0.4.9
 buildout-script = 0.2a1
 buildout-versions = 1.7
 django-appconf = 0.5
 auf-references-client = 0.4.9
 buildout-script = 0.2a1
 buildout-versions = 1.7
 django-appconf = 0.5

-django-compressor = 1.1.2

 django-debug-toolbar = 0.9.4
 django-exportateur = 1.0
 django-pagination = 1.0.7
 django-debug-toolbar = 0.9.4
 django-exportateur = 1.0
 django-pagination = 1.0.7

@@ -78,12 +73,25 @@ python-memcached = 1.48
 # caldav==0.1.12
 vobject = 0.8.1c
 
 # caldav==0.1.12
 vobject = 0.8.1c
 

+# Added by Buildout Versions at 2012-04-17 18:07:32.342631
+django-admin-tools = 0.4.1
+
+# Added by Buildout Versions at 2012-05-15 17:27:59.816025
+auf.django.references = 0.24
+
+# Added by Buildout Versions at 2012-09-17 11:03:22.899749
+auf.recipe.django = 2.1
+

 # Required by:
 # Required by:

-# auf.recipe.django==1.7
+# auf.recipe.django==2.1

 # djangorecipe==1.1.2
 # djangorecipe==1.1.2

-zc.buildout = 1.5.2
+zc.buildout = 1.6.3

 
 # Required by:
 
 # Required by:

-# auf.recipe.django==1.7
+# auf.recipe.django==2.1

 # djangorecipe==1.1.2
 zc.recipe.egg = 1.3.2
 # djangorecipe==1.1.2
 zc.recipe.egg = 1.3.2

+
+# Added by Buildout Versions at 2012-11-06 14:51:17.543611
+auf.django.piwik = 1.8
+raven = 2.0.9