diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-23 03:19:57 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-23 03:19:57 +0200 |
commit | 38324c570b954f075865ea59abaf2c6caf0c1de0 (patch) | |
tree | 92b4e78b27465a839da63544802c99ec1ff06faa /CHANGELOG | |
parent | 8c0cb19323d385b6a2bdbc654b096038893e9b05 (diff) | |
parent | 1906e0f573b7476636735fa6d60d865c01f1acf8 (diff) | |
download | ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.tar.gz ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.tar.bz2 ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.zip |
info change log update + merge conflict
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -15,10 +15,12 @@ Version 2.3 New ponies: blaze + New extraponies: fyrefly (Tumblr), surprise (Tumblr), woona (moonstuck), + woonanohat (moonstuck) + Pony symlink added: pinkieoink → oinkoinkoink - Support for non-MLP:FiM ponies (known as extraponies), - although the directory is currently empty. + Support for non-MLP:FiM ponies (known as extraponies). Version 2.2 |