Merge branch 'erp5' into erp5-generic
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
Showing
File moved
slapos/recipe/lamp/runner.py
0 → 100644
software/drupal/instance.cfg
0 → 100644
software/drupal/software.cfg
0 → 100644
software/eSKUeL/instance.cfg
0 → 100644
software/eSKUeL/software.cfg
0 → 100644
software/joomla/instance.cfg
0 → 100644
software/joomla/software.cfg
0 → 100644
software/openX/instance.cfg
0 → 100644
software/openX/software.cfg
0 → 100644
software/phpbb/instance.cfg
0 → 100644
software/phpbb/software.cfg
0 → 100644
software/piwigo/instance.cfg
0 → 100644
software/piwigo/software.cfg
0 → 100644
software/piwik/instance.cfg
0 → 100644
software/piwik/software.cfg
0 → 100644
software/punbb/instance.cfg
0 → 100644
software/punbb/software.cfg
0 → 100644
software/spip/instance.cfg
0 → 100644
software/spip/software.cfg
0 → 100644
software/tiki/instance.cfg
0 → 100644
software/tiki/software.cfg
0 → 100644
software/xoops/instance.cfg
0 → 100644
software/xoops/software.cfg
0 → 100644
Please register or sign in to comment