[git] ignoring phpdox output
Merge branch 'develop'