Merge branch 'master' into erp5-component
[slapos.git] / software / maarch / development.cfg
2013-05-17 Alain TakoudjouMerge master into grid-computing
2013-03-29 Cédric de Saint... Merge branch 'frontend'
2013-03-29 Cédric de Saint... Merge branch 'slaprunner'
2013-03-27 Kazuhiko ShiozakiMerge branch 'erp5-component' into erp5
2013-03-26 Cédric de Saint... Merge branch 'example'
2013-03-21 Kazuhiko ShiozakiMerge branch 'master' into erp5-component
2013-03-21 Kazuhiko ShiozakiMerge branch 'erp5'
2013-03-15 Marco MarianiMerge branch 'maarch'
2013-03-15 Marco Marianirefer to master branch
2013-03-05 Cédric de Saint... Merge branch 'agent'
2013-02-14 Alain Takoudjoumerge master into grid-computing-merge
2013-02-13 Cédric de Saint... Merge remote-tracking branch 'viktor/master'
2013-02-05 Kazuhiko ShiozakiMerge branch 'erp5-component' into erp5
2013-02-01 Gabriel MonneratMerge branch 'erp5' into master
2013-01-29 Cédric de Saint... Merge branch 'erp5-component-merge' into erp5-component
2013-01-24 Cédric de Saint... Merge branch 'master' into slaprunner
2013-01-15 Cédric de Saint... Merge remote-tracking branch 'origin/erp5-component...
2013-01-11 Cédric de Saint... Merge branch 'master' into erp5-component
2013-01-10 Cédric de Saint... Merge branch 'lamp'
2013-01-10 Marco Marianiremoved empty, unused configuration file, simplified...
2013-01-08 Cédric de Saint... Merge remote-tracking branch 'origin/master' into lamp
2013-01-08 Marco MarianiMerge remote-tracking branch 'origin/master' into lapp...
2013-01-03 Marco Marianiremove += from develop section
2012-12-20 Marco Marianidevelopment.cfg