-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into doctrine_dbal
Conflicts: README.md
- Loading branch information
Showing
2 changed files
with
2 additions
and
2 deletions.
There are no files selected for viewing
Submodule phpcr-utils
updated
2 files
+1 −1 | composer.json | |
+11 −11 | src/PHPCR/Util/QOM/Sql2Scanner.php |
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 |