Alys 7d579ea08a Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM ...

Conflicts:
	website/views/shared/modals/members.jade

2015-04-05 23:24:46 +10:00

..

achievements.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

buy-gems.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

classes.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

death.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

drops.jade

Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement

2015-03-26 18:30:56 -04:00

index.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

invite-friends.jade

Merge branch 'develop' into common-convert

2015-02-10 16:27:46 -06:00

limited.jade

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-02-12 13:32:23 -06:00

members.jade

Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM

2015-04-05 23:24:46 +10:00

new-stuff.jade

Ensure Bailey always displays the most recent message.

2015-03-31 20:38:15 -04:00

quest-rewards.jade

fix(quests): Reference string correctly

2015-03-17 21:51:28 -05:00

quests.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

rebirth.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

reroll.jade

Moved folders to website directory

2015-02-03 14:10:55 -06:00

settings.jade

add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it

2015-03-07 18:39:43 +10:00