summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-12-16 19:48:53 -0500
committerChris McDonough <chrism@plope.com>2014-12-16 19:48:53 -0500
commit27db38880d46b6f4345cf86766924de976e24177 (patch)
tree8c5dcf10f1177e6b0fc212cd8fa0eea20ecf9f5d /CONTRIBUTORS.txt
parentb1fac53cd0c3b930aec90e27f4d19c5f785f52e2 (diff)
parentcc15bbf7de74f4cdfc676e34fa429d2658d1ddf6 (diff)
downloadpyramid-27db38880d46b6f4345cf86766924de976e24177.tar.gz
pyramid-27db38880d46b6f4345cf86766924de976e24177.tar.bz2
pyramid-27db38880d46b6f4345cf86766924de976e24177.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c77d3e92c..9c2191f3b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -232,3 +232,7 @@ Contributors
- Amit Mane, 2014/01/23
- Fenton Travers, 2014/05/06
+
+- Randall Leeds, 2014/11/11
+
+- Hugo Branquinho, 2014/11/25