Merge branch '2.6' into 2.7

* 2.6:
  fixed typo
This commit is contained in:
Fabien Potencier 2015-01-07 22:37:22 +01:00
commit 728e05e016

View File

@ -216,7 +216,7 @@ class JsonDescriptor extends Descriptor
'synthetic' => $definition->isSynthetic(),
'lazy' => $definition->isLazy(),
'synchronized' => $definition->isSynchronized(),
'abstract' => $definition->isSynchronized(),
'abstract' => $definition->isAbstract(),
'file' => $definition->getFile(),
);