Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop ...

Conflicts:
	src/models/user.js
	views/shared/modals/index.jade

2013-12-31 08:04:51 -07:00

..

achievements.jade

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 08:04:51 -07:00

stats.jade

Fix #2181 (allocated points showing up in Class Equip Bonus)

2013-12-30 07:33:17 -06:00