into develop Conflicts: htdocs/user/index.php htdocs/user/info.php htdocs/user/note.php htdocs/user/param_ihm.php |
||
|---|---|---|
| .. | ||
| class | ||
| group | ||
| clicktodial.php | ||
| fiche.php | ||
| home.php | ||
| index.php | ||
| info.php | ||
| ldap.php | ||
| logout.php | ||
| note.php | ||
| param_ihm.php | ||
| passwordforgotten.php | ||
| perms.php | ||