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

Conflicts:
	views/options/inventory/stable.jade

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

..

index.jade

challenges: switch from ngRoute to ui-router

2013-10-28 11:34:08 -07:00

inventory.jade

mounts: temporarily remove mounts code from views. merging to master so

2013-11-14 12:59:00 -08:00

stable.jade

Merge branch 'mounts' into develop

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