diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:39 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:39 +0200 |
| commit | 4774e74ba0af1d1716b832c31e3bf31aed305e4b (patch) | |
| tree | a2d2b4fb14895486c04262da022d4bdea7acd7d6 /CREDITS | |
| parent | f763439803559312cd57835d5fc714a963b1788a (diff) | |
| parent | 64b726770a07a0e04bcec3cf8ab23af4bcc2332f (diff) | |
| download | ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.tar.gz ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.tar.bz2 ponysay-4774e74ba0af1d1716b832c31e3bf31aed305e4b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,12 +3,12 @@ # Active developers Erkin Batu Altunbaş Mattias Andrée +Elis Axelsson Sven-Hendrik Haase Pablo Lezaeta Jan Alexander Steffens # Patchers and other contributors -Elis Axelsson Duane Bekaert Kyah Rindlisbacher James Ross-Gowan |