Merge branch 'master' into erp5
Conflicts: software/erp5/software.cfg
Showing
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
This diff is collapsed.
This diff is collapsed.
software/spip/instance.cfg
0 → 100644
This diff is collapsed.
software/spip/software.cfg
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
software/tiki/instance.cfg
0 → 100644
This diff is collapsed.
software/tiki/software.cfg
0 → 100644
This diff is collapsed.
software/xoops/instance.cfg
0 → 100644
This diff is collapsed.
software/xoops/software.cfg
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment