diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2017-01-02 12:32:22 -0800 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2017-01-02 12:32:22 -0800 |
| commit | f137da811dcb0b94964228b5ec29fe6995254540 (patch) | |
| tree | 901640681717e48220598de06630cb358f30a555 | |
| parent | 7a9b11f3428243d368690b9485098e2d531703e7 (diff) | |
| parent | b7d1d0e77a7d79c90e30352b678716435dcd1349 (diff) | |
| download | symfony-security-f137da811dcb0b94964228b5ec29fe6995254540.zip symfony-security-f137da811dcb0b94964228b5ec29fe6995254540.tar.gz symfony-security-f137da811dcb0b94964228b5ec29fe6995254540.tar.bz2 | |
Merge branch '3.1' into 3.2v3.2.2origin/3.2
* 3.1:
updated LICENSE year
updated LICENSE year
Fixed `@return self` with `$this`
| -rw-r--r-- | Core/LICENSE | 2 | ||||
| -rw-r--r-- | Csrf/LICENSE | 2 | ||||
| -rw-r--r-- | Guard/LICENSE | 2 | ||||
| -rw-r--r-- | Http/LICENSE | 2 | ||||
| -rw-r--r-- | LICENSE | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Core/LICENSE b/Core/LICENSE index 12a7453..17d16a1 100644 --- a/Core/LICENSE +++ b/Core/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2016 Fabien Potencier +Copyright (c) 2004-2017 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 diff --git a/Csrf/LICENSE b/Csrf/LICENSE index 12a7453..17d16a1 100644 --- a/Csrf/LICENSE +++ b/Csrf/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2016 Fabien Potencier +Copyright (c) 2004-2017 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 diff --git a/Guard/LICENSE b/Guard/LICENSE index 12a7453..17d16a1 100644 --- a/Guard/LICENSE +++ b/Guard/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2016 Fabien Potencier +Copyright (c) 2004-2017 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 diff --git a/Http/LICENSE b/Http/LICENSE index 12a7453..17d16a1 100644 --- a/Http/LICENSE +++ b/Http/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2016 Fabien Potencier +Copyright (c) 2004-2017 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 @@ -1,4 +1,4 @@ -Copyright (c) 2004-2016 Fabien Potencier +Copyright (c) 2004-2017 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 |