projets
/
auf_rh_dae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
44635e2
27a3b6f
)
Merge branch 'hotfix' into recrutement
author
PA Parent
<paparent@paparent.me>
Fri, 8 Jun 2012 15:19:05 +0000
(11:19 -0400)
committer
PA Parent
<paparent@paparent.me>
Fri, 8 Jun 2012 15:19:05 +0000
(11:19 -0400)
Conflicts:
versions.cfg
1
2
versions.cfg
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
versions.cfg
index
b565789
,
b4a5bfb
..
6e7682f
---
1
/
versions.cfg
---
2
/
versions.cfg
+++ b/
versions.cfg
@@@
-61,5
-60,5
+60,8
@@@
setuptools = 0.6c12dev-r8884
# Added by Buildout Versions at 2012-05-30 13:39:28.023002
django-picklefield = 0.2.1
+# Added by Buildout Versions at 2012-06-06 10:42:23.231268
+auf.django.export = 0.3
++
+ # Added by Buildout Versions at 2012-06-08 11:15:52.545562
+ auf.django.emploi = 1.2dev