1
0
mirror of synced 2025-01-24 09:11:40 +03:00
Johannes Schmitt 4f585a3d63 Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects
Conflicts:
	UPGRADE.md
	lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
2014-01-04 17:52:32 +01:00
..
2013-05-17 11:59:28 -03:00
2013-05-17 11:59:28 -03:00