diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-10-11 23:09:44 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-10-11 23:09:44 +0200 |
| commit | 43959ae2c58c9996f030d9e5d2918b58b198bf54 (patch) | |
| tree | ceea7bd8e5ff7b3606409201269e1fb07a8572a9 /ponyquotes/ponies | |
| parent | 6892c51ba65bccfb06fef3cf0413bd87185b0aa1 (diff) | |
| parent | d6ff403fc7122fdb818c7600c875589141f3b126 (diff) | |
| download | ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.tar.gz ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.tar.bz2 ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ponyquotes/ponies')
| -rw-r--r-- | ponyquotes/ponies | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ponyquotes/ponies b/ponyquotes/ponies index 59e94c1..f01c407 100644 --- a/ponyquotes/ponies +++ b/ponyquotes/ponies @@ -149,7 +149,7 @@ screwball screwloose seaswirl shadowbolts -shiningarmor+shiningarmorguard +shiningarmor+shiningarmorguard+shiningarmorwedding silverspeed silverspoon silverstar @@ -164,6 +164,7 @@ sparkler+amethyststar spike+spikefloat+spikelove+spikemustache spitfire spot +starlight stella stevenmagnet+stevenmagnettrue strongheart @@ -172,8 +173,10 @@ sunirays surprise sweetie tank +tenderheart theodoredonaldkerabatsos thunderlane +tom tornadobolt trixie+trixiestage+trixiestand+lulamoon+trixielulamoon truffleshuffle |