diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 21:54:04 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 21:54:04 -0500 |
| commit | 58d2a5f14bb787defefe7a2b1b36665c4991c0da (patch) | |
| tree | 3eff83e38ad641e7285ce6788cad47a12fa14262 /COPYRIGHT.txt | |
| parent | f081ae991a9107363fceeeeccd361c2f85bdd046 (diff) | |
| parent | 279ee00fff1894b3451d84a8eeafae42e8638776 (diff) | |
| download | pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.gz pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.bz2 pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.zip | |
Merge branch 'master' into fix-deprecated-accept-predicate
Diffstat (limited to 'COPYRIGHT.txt')
| -rw-r--r-- | COPYRIGHT.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 645160fa5..6e23cb876 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1,4 +1,4 @@ -Copyright (c) 2008-2011 Agendaless Consulting and Contributors. +Copyright (c) 2008-2018 Agendaless Consulting and Contributors. (http://www.agendaless.com), All Rights Reserved Portions (c) Zope Foundation and contributors (http://www.zope.org/). |