summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-07-07 08:47:56 -0400
committerPaul Everitt <paul@agendaless.com>2013-07-07 08:47:56 -0400
commitd44d0e044555cd1287680fc8368632a64ebe979b (patch)
tree8a70d4025a8ee19b82e2a915bc668130b405cf93 /CONTRIBUTORS.txt
parent47eaa189e115936a86357380accd8d472e4d9a6c (diff)
parentd59440878b67b65e57c91c7b4aa8e7cbf943a729 (diff)
downloadpyramid-d44d0e044555cd1287680fc8368632a64ebe979b.tar.gz
pyramid-d44d0e044555cd1287680fc8368632a64ebe979b.tar.bz2
pyramid-d44d0e044555cd1287680fc8368632a64ebe979b.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 97eb54f7b..61155ca80 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -198,3 +198,5 @@ Contributors
- Georges Dubus, 2013/03/21
- Jason McKellar, 2013/03/28
+
+- Luke Cyca, 2013/05/30