Conflicts: htdocs/core/class/extrafields.class.php htdocs/filefunc.inc.php htdocs/takepos/css/phone.css htdocs/takepos/invoice.php |
||
|---|---|---|
| .. | ||
| auguria_menu.php | ||
| auguria.lib.php | ||
| eldy_menu.php | ||
| eldy.lib.php | ||
| empty.php | ||
| index.html | ||
Conflicts: htdocs/core/class/extrafields.class.php htdocs/filefunc.inc.php htdocs/takepos/css/phone.css htdocs/takepos/invoice.php |
||
|---|---|---|
| .. | ||
| auguria_menu.php | ||
| auguria.lib.php | ||
| eldy_menu.php | ||
| eldy.lib.php | ||
| empty.php | ||
| index.html | ||