diff options
| author | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-09-27 01:24:33 -0500 |
| commit | f4404b11a89f9d32652702190506984a594d8393 (patch) | |
| tree | 67a7b7b22726d89be68383d27da80c3ef4a72cb2 /COPYRIGHT.txt | |
| parent | 97ee7f3aa8af74a01e51c0c14fda1c0a5a490663 (diff) | |
| parent | 4eade6a2fa6111673231b02344afdc562fe7f05d (diff) | |
| download | pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.gz pyramid-f4404b11a89f9d32652702190506984a594d8393.tar.bz2 pyramid-f4404b11a89f9d32652702190506984a594d8393.zip | |
Merge branch 'master' into deprecate-pickle-sessions
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/). |