• 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
__init__.py 7.01 KB