Merge remote-tracking branch 'laminas/develop' into CSP-Report-Only

laminas · Apr 27, 2020 · 26d4ce8 · 26d4ce8
2 parents 0bebb78 + d0916b1
commit 26d4ce8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,7 @@
 /.ci/ export-ignore
 /.coveralls.yml export-ignore
 /.gitattributes export-ignore
+/.github/ export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
 /docs/ export-ignore

diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
   repository_dispatch:
+    types: docs-build
 
 jobs:
   build-deploy:

diff --git a/COPYRIGHT.md b/COPYRIGHT.md
@@ -1,2 +1 @@
-Copyright (c) 2019-2020, Laminas Foundation.
-All rights reserved. (https://getlaminas.org/)
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC. (https://getlaminas.org/)
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,5 +1,4 @@
-Copyright (c) 2019-2020, Laminas Foundation
-All rights reserved.
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/composer.json b/composer.json
@@ -62,6 +62,6 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "replace": {
-        "zendframework/zend-http": "self.version"
+        "zendframework/zend-http": "^2.11.2"
     }
 }