4fa4ee0acc
Conflicts: admin/migration.php |
||
---|---|---|
.. | ||
config.template.php | ||
constants.php | ||
i18n.php | ||
init.php | ||
smarty.php | ||
XXconfig.php |
4fa4ee0acc
Conflicts: admin/migration.php |
||
---|---|---|
.. | ||
config.template.php | ||
constants.php | ||
i18n.php | ||
init.php | ||
smarty.php | ||
XXconfig.php |