Laurent Destailleur 0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/filefunc.inc.php

2016-04-29 20:43:42 +02:00

..

cabyprodserv.php

Merge remote-tracking branch 'origin/3.9' into develop

2016-04-29 20:43:42 +02:00

cabyuser.php

Fix presentation

2015-10-07 21:06:55 +02:00

casoc.php

Fix presentation

2015-10-07 21:06:55 +02:00

index.php

Fix: missing getEntity function

2015-04-19 03:05:37 +02:00