Merge branch 'hotfix/zendframework/zf2#7108-form-annotation-options-m… · laminas/laminas-serializer@b164478 · GitHub

Commit

Merge branch 'hotfix/zendframework/zendframework#7108-form-annotation…

Browse files

…-options-merge-support' into develop

Close zendframework/zendframework#7108
Forward port zendframework/zendframework#7108

Loading branch information

Ocramius committed Jan 12, 2015

2 parents 81a2ac1 + 3de0e3b commit b164478