Merge branch 'develop' of github.com:erkin/ponysay into develop

This commit is contained in:
Mattias Andrée 2013-01-20 02:39:28 +01:00
commit 69c70064d1

View file

@ -29,7 +29,7 @@ MASTER: daisy
NAME: Daisy
NAME: Rose
NAME: (not mentioned)
OTHER NAMES: Flower Wishes (unofficial, a toy match here
OTHER NAMES: Flower Wishes (unofficial, a toy match here)
OTHER NAMES: Roseluck (official, toy line)
OTHER NAMES: Lily Valley (official, on collector card)
POSE: disaster