Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop ...

Conflicts:
	views/options/inventory/stable.jade

2013-11-14 13:04:44 -08:00

..

avatar.jade

mounts: only show mount head in stable (fix later), use egg.mountText

2013-11-11 13:50:11 -08:00

header.jade

[#1751] /challenges/:cid/:mid task filtering by "in this challenge" at

2013-11-10 23:41:42 -08:00

menu.jade

[#1710] some simplification on Groups memoization. No need for all that

2013-11-01 20:15:04 -07:00