diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:18 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:18 +0200 |
| commit | 64b726770a07a0e04bcec3cf8ab23af4bcc2332f (patch) | |
| tree | a2d2b4fb14895486c04262da022d4bdea7acd7d6 /CREDITS | |
| parent | 41b2d257c71f654dd2fd9921d1f75f44b97a6592 (diff) | |
| parent | 6dc632a155db800997e0eb2dec420a6233a2d141 (diff) | |
| download | ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.gz ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.bz2 ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.zip | |
merge conflict resolved
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 |