Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang |
||
|---|---|---|
| .. | ||
| bankjournal.php | ||
| expensereportsjournal.php | ||
| index.html | ||
| purchasesjournal.php | ||
| sellsjournal.php | ||
Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang |
||
|---|---|---|
| .. | ||
| bankjournal.php | ||
| expensereportsjournal.php | ||
| index.html | ||
| purchasesjournal.php | ||
| sellsjournal.php | ||