aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-09-29 22:21:14 +0200
committerMattias Andrée <maandree@operamail.com>2012-09-29 22:21:14 +0200
commit3447dcdab7946619f42568881bf8368490329b06 (patch)
treebbc8421bdefffe18a5edceea5fe5b9a6da88d0a5 /CHANGELOG
parent0e5ce47b7b15b08bcb4633c766ee49a6b05cf15b (diff)
parentcc6df2706f0ee88a32ced8f14bbe6c40d9bc121a (diff)
downloadponysay-3447dcdab7946619f42568881bf8368490329b06.tar.gz
ponysay-3447dcdab7946619f42568881bf8368490329b06.tar.bz2
ponysay-3447dcdab7946619f42568881bf8368490329b06.zip
Merge branch 'develop'
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2da730c..2c8d64d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,13 +7,15 @@ Version 2.7
New extraponies: blueballblitz (Various fanfics, Shadowbolt), drhooves1, drhooves2, drhooves3,
drhooves4, drhooves5, drhooves6, drhooves7, drhooves8, drhooves9, drhooves10,
- drhooves11, nyx (Fanfic: Past Sins), nyxdisguised (Fanfic: Past Sins)
+ drhooves11, nyx (Fanfic: Past Sins), nyxdisguised (Fanfic: Past Sins),
+ pinkaminacupcake (Fanfic)
Pony renamed: cracky to crackle
+
Version 2.6
- New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, candylicious,
+ New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, candylicious,
cherrycola, cracky, cutiemarkcrusaders, derpybags, derpycloud, firestreak,
hughjelly, lemonhearts, lyrabonbon, noi, pictureperfect, pigpen,
poppycock, quickfix, rainbowhurricane, rainboshadowbolt, silverspeed,