Laurent Destailleur 6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/core/menus/standard/eldy.lib.php

2015-07-30 14:54:33 +02:00

..

auguria_menu.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

auguria.lib.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

eldy_menu.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

eldy.lib.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2015-07-30 14:54:33 +02:00

empty.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.php

…