Merge branch 'develop' into sabrecat/party-page

This commit is contained in:
Blade Barringer 2015-08-22 12:44:07 -05:00
commit 63b492ab51

View file

@ -4,8 +4,8 @@ h5 8/19/2015 - CHEETAH PET QUEST, iPAD APP, and GRYPHON CONTEST WINNER!
td
.Pet-Cheetah-Base.pull-right
h5 Cheetah Pet Quest
p A new pet quest is available in the <a href='/#/options/inventory/quests'>Quests Page</a>: The Dreadful Cheetah! A Cheetah is speeding past incomplete tasks and burning them up before people can complete them. Can you put on the brakes? If so, youll be awarded with some cheetah eggs!
p.small.muted by PainterProphet, tivaquinn, Unruly Hyena, Crawford, Janet Mongilio, Lemoness, and SabreCat
p A new pet quest is available in the <a href='/#/options/inventory/quests'>Quests Page</a>: Such a Cheetah! A Cheetah is speeding past incomplete tasks and burning them up before people can complete them. Can you put on the brakes? If so, youll be awarded with some cheetah eggs!
p.small.muted by PainterProphet, tivaquinn, Unruly Hyena, Crawford, janetmango, Lemoness, and SabreCat
tr
td
h5 iOS Update and iPad App