sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
habitica/views/options/inventory
History
Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
..
index.jade challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
inventory.jade Merge branch 'develop' into classes 2013-12-02 18:24:33 -07:00
stable.jade thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00