diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-10-04 22:20:20 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-10-04 22:20:20 +0200 |
| commit | d37e1bbb9dd0d882485b44b4b63c41e4c58f93be (patch) | |
| tree | ae259e329e420196c2a5ccc4862b3c2ea04bb0db /ponyquotes/ponies | |
| parent | 1096f2c86ea0e07383b97c4aa8b148ca841cc0f9 (diff) | |
| parent | 01ca2593fec8fbeb39feeb72529544fa3d35b55b (diff) | |
| download | ponysay-d37e1bbb9dd0d882485b44b4b63c41e4c58f93be.tar.gz ponysay-d37e1bbb9dd0d882485b44b4b63c41e4c58f93be.tar.bz2 ponysay-d37e1bbb9dd0d882485b44b4b63c41e4c58f93be.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ponyquotes/ponies')
| -rw-r--r-- | ponyquotes/ponies | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ponyquotes/ponies b/ponyquotes/ponies index 998e355..59e94c1 100644 --- a/ponyquotes/ponies +++ b/ponyquotes/ponies @@ -1,4 +1,5 @@ ace +airheart allie aloe angel @@ -9,6 +10,7 @@ applefritter applejack+applejackscarecrow+fillyjack+fillyjacktravel archer basil +bastionyorsets+georgewashingtony berrypunch bigmac blaze @@ -107,6 +109,7 @@ opal orange owl+owlowiscious parasprite +peppermoon perry+perrypierce persnickety petunia @@ -165,6 +168,7 @@ stella stevenmagnet+stevenmagnettrue strongheart sue+suedance +sunirays surprise sweetie tank |