aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-10-11 23:09:44 +0200
committerMattias Andrée <maandree@operamail.com>2012-10-11 23:09:44 +0200
commit43959ae2c58c9996f030d9e5d2918b58b198bf54 (patch)
treeceea7bd8e5ff7b3606409201269e1fb07a8572a9 /CHANGELOG
parent6892c51ba65bccfb06fef3cf0413bd87185b0aa1 (diff)
parentd6ff403fc7122fdb818c7600c875589141f3b126 (diff)
downloadponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.tar.gz
ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.tar.bz2
ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.zip
Merge branch 'master' into develop
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4552ce4..d73a4bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Version 2.8
- New ponies: airheart, bastionyorsets, peppermoon, sunnyrays
+ New ponies: airheart, bastionyorsets, peppermoon, shiningarmorwedding, starlight,
+ sunnyrays, tenderheart, tom
Pony symlink added: georgewachingtony → bastionyorsets