diff options
| author | Christoph Zwerschke <cito@online.de> | 2016-04-19 20:07:12 +0200 |
|---|---|---|
| committer | Christoph Zwerschke <cito@online.de> | 2016-04-19 20:07:12 +0200 |
| commit | 3629c49e46207ff5162a82883c14937e6ef4c186 (patch) | |
| tree | 1306181202cb8313f16080789f5b9ab1eeb61d53 /COPYRIGHT.txt | |
| parent | 804ba0b2f434781e77d2b5191f1cd76a490f6610 (diff) | |
| parent | 6c16fb020027fac47e4d2e335cd9e264dba8aa3b (diff) | |
| download | pyramid-3629c49e46207ff5162a82883c14937e6ef4c186.tar.gz pyramid-3629c49e46207ff5162a82883c14937e6ef4c186.tar.bz2 pyramid-3629c49e46207ff5162a82883c14937e6ef4c186.zip | |
Merge remote-tracking branch 'refs/remotes/Pylons/master'
Diffstat (limited to 'COPYRIGHT.txt')
| -rw-r--r-- | COPYRIGHT.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 51c76455e..645160fa5 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1,8 +1,8 @@ Copyright (c) 2008-2011 Agendaless Consulting and Contributors. (http://www.agendaless.com), All Rights Reserved -Portions (c) Django Project (http://djangoproject.com/). - Portions (c) Zope Foundation and contributors (http://www.zope.org/). Portions (c) Edgewall Software (http://edgewall.org) + +Portions (c) Ian Bicking. |