diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:01:59 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:01:59 +0100 |
| commit | 6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571 (patch) | |
| tree | d46500c4f856715d9c3b823dd4568edb41d28cdc /Http | |
| parent | 66b3190f2c91508e73f4181fe4b718d19587346b (diff) | |
| parent | 21a953b1896d6c3e886f1dd3819793be207d09b6 (diff) | |
| download | symfony-security-6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571.zip symfony-security-6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571.tar.gz symfony-security-6c39103b6f13e2bcde7c3543a8e28e0dd3c1f571.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
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
Updated copyright to 2015
Clarify a comment.
Conflicts:
src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/LICENSE b/Http/LICENSE index 0b3292c..43028bc 100644 --- a/Http/LICENSE +++ b/Http/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2014 Fabien Potencier +Copyright (c) 2004-2015 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal |