Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into doctrine_dbal
Browse files Browse the repository at this point in the history 
Conflicts:
	README.md
  • Loading branch information
@justinrainbow
justinrainbow committed Dec 5, 2011
2 parents ab58b56 + 6f1efb6 commit da2de3b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/phpcr-utils
Submodule phpcr-utils updated 2 files
+1 −1 composer.json
+11 −11 src/PHPCR/Util/QOM/Sql2Scanner.php
2 changes: 1 addition & 1 deletion tests/phpcr-api
Submodule phpcr-api updated 4 files
+1 −1 tests/05_Reading/NodeReadMethodsTest.php
+1 −1 tests/05_Reading/PropertyReadMethodsTest.php
+5 −1 tests/06_Query/QOM/Sql2ScannerTest.php
+4 −0 tests/10_Writing/NodeTypeAssignementTest.php

0 comments on commit da2de3b

Please sign in to comment.