resolving repo conflicts

This commit is contained in:
Serghey Rodin 2016-06-25 11:07:06 +03:00
commit 704bf770f7
9 changed files with 963 additions and 375 deletions

View file

@ -15,7 +15,7 @@ exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain, $output, $ret
if ($return_var == 0 ) {
foreach($output as $file) {
echo $file . "\n";
echo htmlentities($file) . "\n";
}
}
echo " </pre>\n</body>\n</html>\n";
echo " </pre>\n</body>\n</html>\n";