Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0

plone · Feb 11, 2014 · f52d1f1 · f52d1f1
2 parents e4e8e74 + 6540b53
commit f52d1f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sources.cfg b/sources.cfg
@@ -95,7 +95,7 @@ plone.app.controlpanel              = git ${remotes:plone}/plone.app.controlpane
 plone.app.customerize               = git ${remotes:plone}/plone.app.customerize.git pushurl=${remotes:plone_push}/plone.app.customerize.git branch=master
 plone.app.dexterity                 = git ${remotes:plone}/plone.app.dexterity.git pushurl=${remotes:plone_push}/plone.app.dexterity.git branch=master
 plone.app.discussion                = git ${remotes:plone}/plone.app.discussion.git pushurl=${remotes:plone_push}/plone.app.discussion.git branch=master
-plone.app.event                     = git ${remotes:plone}/plone.app.event.git pushurl=${remotes:plone_push}/plone.app.event.git branch=plone5
+plone.app.event                     = git ${remotes:plone}/plone.app.event.git pushurl=${remotes:plone_push}/plone.app.event.git branch=master
 plone.app.folder                    = git ${remotes:plone}/plone.app.folder.git pushurl=${remotes:plone_push}/plone.app.folder.git branch=master
 plone.app.form                      = git ${remotes:plone}/plone.app.form.git pushurl=${remotes:plone_push}/plone.app.form.git branch=master
 plone.app.i18n                      = git ${remotes:plone}/plone.app.i18n.git pushurl=${remotes:plone_push}/plone.app.i18n.git branch=master

diff --git a/versions.cfg b/versions.cfg
@@ -127,7 +127,7 @@ five.formlib                          = 1.0.4
 five.globalrequest                    = 1.0
 five.localsitemanager                 = 2.0.5
 five.pt                               = 2.2.1
-icalendar                             = 3.6
+icalendar                             = 3.6.1
 plone.app.blob                        = 1.5.8
 plone.app.caching                     = 1.1.4
 plone.app.collection                  = 1.0.10
@@ -167,7 +167,7 @@ plone.app.vocabularies                = 2.1.12
 plone.app.workflow                    = 2.1.5
 plone.app.z3cform                     = 0.7.3
 plone.alterego                        = 1.0
-plone.autoform                        = 1.4
+plone.autoform                        = 1.5
 plone.batching                        = 1.0
 plone.behavior                        = 1.0.2
 plone.browserlayer                    = 2.1.2
@@ -181,7 +181,7 @@ plone.folder                          = 1.0.4
 plone.formwidget.datetime             = 1.0
 plone.formwidget.namedfile            = 1.0.9
 plone.formwidget.querystring          = 1.1.0
-plone.formwidget.recurrence           = 1.0
+plone.formwidget.recurrence           = 1.1
 plone.i18n                            = 2.0.8
 plone.indexer                         = 1.0.2
 plone.intelligenttext                 = 2.0.2