Conflicts: htdocs/core/modules/modPartnership.class.php htdocs/modulebuilder/template/core/modules/modMyModule.class.php |
||
|---|---|---|
| .. | ||
| stats | ||
| comment.php | ||
| contact.php | ||
| document.php | ||
| list.php | ||
| note.php | ||
| task.php | ||
| time.php | ||
Conflicts: htdocs/core/modules/modPartnership.class.php htdocs/modulebuilder/template/core/modules/modMyModule.class.php |
||
|---|---|---|
| .. | ||
| stats | ||
| comment.php | ||
| contact.php | ||
| document.php | ||
| list.php | ||
| note.php | ||
| task.php | ||
| time.php | ||