Thibaud Fabre 0374deaf37 Fix merge error

2016-12-06 13:53:26 +01:00

..

Field

bump copyright year

2016-01-05 13:38:14 +01:00

cgu.php

bump copyright year

2016-01-05 13:38:14 +01:00

descriptionStructure.php

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

field.php

Merge branch 4.0

2016-12-05 15:26:48 +01:00

status.php

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

subdef.php

Fix merge error

2016-12-06 13:53:26 +01:00

subdefsStructure.php

Merge branch 4.0

2016-12-05 15:26:48 +01:00