1. 17 Nov, 2011 1 commit
    • Sebastien Robin's avatar
      Merge branch 'erp5' into erp5-generic · d2f5c4f8
      Sebastien Robin authored
      Conflicts:
      	slapos/recipe/erp5/__init__.py
      	slapos/recipe/erp5/template/initmysql.sql.in
      	slapos/recipe/erp5/template/mysql-init-database.sql.in
      	slapos/recipe/generic_mysql/template/initmysql.sql.in
      	software/erp5/instance.cfg
      	software/erp5/software.cfg
      d2f5c4f8
  2. 14 Nov, 2011 1 commit
  3. 10 Nov, 2011 17 commits
  4. 09 Nov, 2011 10 commits
  5. 08 Nov, 2011 11 commits