aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorPablo Lezaeta <prflr88@gmail.com>2012-09-06 20:52:34 -0300
committerPablo Lezaeta <prflr88@gmail.com>2012-09-06 20:52:34 -0300
commit013fdb6a1c292ecc8e40dc09b15b473cf4621c7b (patch)
treea6d6d0d8e56b5934870a108ac00a4909b588c65b /CHANGELOG
parent1ce457cf90673b5aa794aa88ad4dbdc96569ad7f (diff)
parentb01b461e2e3022a60b0582d98a6cd14385e50528 (diff)
downloadponysay-013fdb6a1c292ecc8e40dc09b15b473cf4621c7b.tar.gz
ponysay-013fdb6a1c292ecc8e40dc09b15b473cf4621c7b.tar.bz2
ponysay-013fdb6a1c292ecc8e40dc09b15b473cf4621c7b.zip
Fix pull and local diferences
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b58f7db..6ce3663 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,11 @@
Version 2.6
- New ponies: applebloomdance, bluberry, blueberrycake, blueharvest, cracky, cutiemarkcrusaders,
+ New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, cracky, cutiemarkcrusaders,
derpybags, derpycloud, firestreak, hughjelly, lemonhearts, lyrabonbon,
noi, pictureperfect, poppycock, quickfix, rainbowhurricane, rainboshadowbolt,
silverspeed, surprise (wonderbolt), thunderlane, timeturner, twilightthebearded
- New extraponies: faust (Alicorn), maria (moonstuck, seapony), posey (tumblr),
+ New extraponies: faust (Alicorn), maria (moonstuck, seapony), posey (tumblr),
slanterpony (Various tumblr), sparkler (tumblr), twilight (Tumblr)
Pony symlink added: epona → quickfix