Matteo Pagliazzi 6ce2f53503 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

2016-05-24 13:11:33 +02:00

..

client

Merge branch 'TheHollidayInn-tasks-delete-checklist' into develop

2016-05-23 21:19:01 -05:00

server

implement cron semi-safe mode - cron behaves as normal except boss causes no damage (#7462)

2016-05-24 13:31:39 +10:00

views

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

2016-05-24 13:11:33 +02:00