Conflicts: htdocs/public/project/suggestbooth.php htdocs/public/project/suggestconference.php |
||
|---|---|---|
| .. | ||
| cheque | ||
| class | ||
| card.php | ||
| index.php | ||
| info.php | ||
| list.php | ||
| rapport.php | ||
| tovalidate.php | ||
Conflicts: htdocs/public/project/suggestbooth.php htdocs/public/project/suggestconference.php |
||
|---|---|---|
| .. | ||
| cheque | ||
| class | ||
| card.php | ||
| index.php | ||
| info.php | ||
| list.php | ||
| rapport.php | ||
| tovalidate.php | ||