Merge branch 'lamp'
Conflicts: CHANGES.txt slapos/recipe/lamp/template/apache.in slapos/recipe/lamp/template/php.ini.in software/lamp-template-static/software.cfg software/lamp-template/software.cfg stack/lamp.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/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
File moved
Please register or sign in to comment