aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorPablo Lezaeta <prflr88@gmail.com>2012-07-18 14:50:47 -0400
committerPablo Lezaeta <prflr88@gmail.com>2012-07-18 14:50:47 -0400
commita05a292af72f2a4269ff02850cac31599878a3a8 (patch)
tree181aa59662ba13f391bf7be9c1a2f0d7ce838e0a /CREDITS
parent10cc33f87aac4a8fb7d553a974cccaedf8852c8d (diff)
parent839f0b20e8e4982da6a152bd6d702b699d352324 (diff)
downloadponysay-a05a292af72f2a4269ff02850cac31599878a3a8.tar.gz
ponysay-a05a292af72f2a4269ff02850cac31599878a3a8.tar.bz2
ponysay-a05a292af72f2a4269ff02850cac31599878a3a8.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 1b13a7e..4134678 100644
--- a/CREDITS
+++ b/CREDITS
@@ -7,10 +7,10 @@ Sven-Hendrik Haase
Jan Alexander Steffens
# Patchers and other contributors
+Elis Axelsson
Duane Bekaert
Pablo Lezaeta
Kyah Rindlisbacher
James Ross-Gowan
Louis Taylor
-Elis
Jannis