summaryrefslogtreecommitdiff
path: root/COPYRIGHT.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:33:18 -0700
committerGitHub <noreply@github.com>2018-10-05 02:33:18 -0700
commit086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /COPYRIGHT.txt
parent2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff)
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
downloadpyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip
Merge branch 'master' into one_cc
Diffstat (limited to 'COPYRIGHT.txt')
-rw-r--r--COPYRIGHT.txt2
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/).