Merge branch 'releases/2.2.2' into develop · zendframework/zf2-documentation@a2fabc3 · GitHub

This repository has been archived by the owner on May 24, 2018. It is now read-only.

Commit

Merge branch 'releases/2.2.2' into develop

Browse files

Conflicts:
	docs/languages/en/conf.py

Loading branch information

weierophinney committed Jul 24, 2013

2 parents ee7b155 + 204d6cc commit a2fabc3