Mike Ng 30f49bdd35 resolve conflict

2018-01-08 15:57:13 +04: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

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01:00

field.php

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01:00

status.php

PHRAS-508_acl-cache

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

subdef.php

resolve conflict

2018-01-08 15:57:13 +04:00

subdefsStructure.php

PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups

2017-12-18 18:02:48 +01:00