Conflicts: htdocs/blockedlog/class/blockedlog.class.php htdocs/contrat/card.php htdocs/societe/card.php |
||
|---|---|---|
| .. | ||
| authority.class.php | ||
| blockedlog.class.php | ||
Conflicts: htdocs/blockedlog/class/blockedlog.class.php htdocs/contrat/card.php htdocs/societe/card.php |
||
|---|---|---|
| .. | ||
| authority.class.php | ||
| blockedlog.class.php | ||