Conflicts: htdocs/comm/propal/list.php htdocs/holiday/class/holiday.class.php Fix case of newByMonth |
||
|---|---|---|
| .. | ||
| auguria_menu.php | ||
| auguria.lib.php | ||
| eldy_menu.php | ||
| eldy.lib.php | ||
| empty.php | ||
Conflicts: htdocs/comm/propal/list.php htdocs/holiday/class/holiday.class.php Fix case of newByMonth |
||
|---|---|---|
| .. | ||
| auguria_menu.php | ||
| auguria.lib.php | ||
| eldy_menu.php | ||
| eldy.lib.php | ||
| empty.php | ||