Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop Conflicts: htdocs/websites/index.php
This commit is contained in:
commit
d0136f5c85
@ -328,7 +328,7 @@ if ($action == 'updatemeta')
|
||||
$filemaster=$pathofwebsite.'/master.inc.php';
|
||||
$fileoldalias=$pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
|
||||
$filealias=$pathofwebsite.'/'.$objectpage->pageurl.'.php';
|
||||
|
||||
|
||||
dol_mkdir($pathofwebsite);
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user