Skip to content

Commit 1669761

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: Use PHPUnit ini_set wrapper in tests [Process] Added a test skip check for Windows [Process] Removed unused variable assignment Fixes various phpdoc and coding standards. Fixes Issue #13184 - incremental output getters now return empty strings Updated copyright to 2015 Conflicts: src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2 parents 05194af + a7bcad3 commit 1669761

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2014 Fabien Potencier
1+
Copyright (c) 2004-2015 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)